From 797f94d3319a6bea2cacce707a6a5ee67f00ea17 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Tue, 10 Nov 2015 15:11:04 -0800 Subject: [PATCH 1/4] RefDirectory.exactRef: Do not ignore symrefs to unborn branch When asked to read a symref pointing to a branch-yet-to-be-born (such as HEAD in a newly initialized repository), DfsRepository and FileRepository return different results. FileRepository: exactRef("HEAD") => null DfsRepository: exactRef("HEAD") => SymbolicRef[HEAD -> refs/heads/master=00000000] getRef("HEAD") returns the same as DfsRepository's exactRef in both backends. The intended behavior is the DfsRepository one: exactRef() is supposed to be like getRef(), but more exact because it doesn't need to traverse the search path. The discrepancy is because DfsRefDatabase implements exactRef() directly with the intended semantics, while RefDirectory uses a fallback implementation built on top of getRefs(). getRefs() skips symrefs to an unborn branch. Override the fallback implementation with a correct implementation that is similar to getRef() to avoid this. A followup change will fix the fallback. Change-Id: Ic138a5564a099ebf32248d86b93e2de9ab3c94ee Reported-by: David Pursehouse Improved-by: Christian Halstrick Bug: 478865 --- .../storage/file/RefDirectoryTest.java | 19 +++++++++++++++ .../internal/storage/file/RefDirectory.java | 24 +++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java index 099159892..d66753da0 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java @@ -1024,6 +1024,25 @@ public class RefDirectoryTest extends LocalDiskRepositoryTestCase { assertNull(refdir.getRef("v1.0")); } + @Test + public void testExactRef_EmptyDatabase() throws IOException { + Ref r; + + r = refdir.exactRef(HEAD); + assertTrue(r.isSymbolic()); + assertSame(LOOSE, r.getStorage()); + assertEquals("refs/heads/master", r.getTarget().getName()); + assertSame(NEW, r.getTarget().getStorage()); + assertNull(r.getTarget().getObjectId()); + + assertNull(refdir.exactRef("refs/heads/master")); + assertNull(refdir.exactRef("refs/tags/v1.0")); + assertNull(refdir.exactRef("FETCH_HEAD")); + assertNull(refdir.exactRef("NOT.A.REF.NAME")); + assertNull(refdir.exactRef("master")); + assertNull(refdir.exactRef("v1.0")); + } + @Test public void testGetRef_FetchHead() throws IOException { // This is an odd special case where we need to make sure we read diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 6a04a538e..bb5b04440 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -261,6 +261,30 @@ public class RefDirectory extends RefDatabase { return loose; } + @Override + public Ref exactRef(String name) throws IOException { + RefList packed = getPackedRefs(); + Ref ref; + try { + ref = readRef(name, packed); + if (ref != null) { + ref = resolve(ref, 0, null, null, packed); + } + } catch (IOException e) { + if (name.contains("/") //$NON-NLS-1$ + || !(e.getCause() instanceof InvalidObjectIdException)) { + throw e; + } + + // While looking for a ref outside of refs/ (e.g., 'config'), we + // found a non-ref file (e.g., a config file) instead. Treat this + // as a ref-not-found condition. + ref = null; + } + fireRefsChanged(); + return ref; + } + @Override public Ref getRef(final String needle) throws IOException { final RefList packed = getPackedRefs(); From 7dcb50a04a03a96e7514a8598eaf9bb052af867e Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Wed, 11 Nov 2015 10:42:46 -0800 Subject: [PATCH 2/4] Fallback exactRef: Do not ignore symrefs to unborn branch When asked to read a symref pointing to a branch-yet-to-be-born (such as HEAD in a newly initialized repository), getRef and getRefs provide different results. getRef: SymbolicRef[HEAD -> refs/heads/master=00000000] getRefs and getAdditionalRefs: nothing exactRef should match the getRef behavior: it is meant to be a simpler, faster version of getRef that lets you search for a ref without resolving it using the search path without other semantic changes. But the fallback implementation of exactRef relies on getRefs and produces null for this case. Luckily the in-tree RefDatabase implementations override exactRef and get the correct behavior. But any out-of-tree storage backend that doesn't inherit from DfsRefDatabase or RefDirectory would still return null when it shouldn't. Let the fallback implementation use getRef instead to avoid this. This means that exactRef would waste some effort traversing the ref search path when the named ref is not found --- but subclasses tend to override exactRef for performance already, so in the default implementation correctness is more important. Bug: 478865 Change-Id: I60f04e3ce3bf4731640ffd2433d329e621330029 --- .../src/org/eclipse/jgit/lib/RefDatabase.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java index ef22fb90f..b62033cbd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java @@ -239,20 +239,11 @@ public abstract class RefDatabase { * @since 4.1 */ public Ref exactRef(String name) throws IOException { - int slash = name.lastIndexOf('/'); - String prefix = name.substring(0, slash + 1); - String rest = name.substring(slash + 1); - Ref result = getRefs(prefix).get(rest); - if (result != null || slash != -1) { - return result; + Ref ref = getRef(name); + if (ref == null || !name.equals(ref.getName())) { + return null; } - - for (Ref ref : getAdditionalRefs()) { - if (name.equals(ref.getName())) { - return ref; - } - } - return null; + return ref; } /** From 3cb5f113982f4ba75f6720cf7428f82b61cd3a32 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 14 Nov 2015 00:09:54 +0100 Subject: [PATCH 3/4] JGit v4.1.1.201511131810-r Change-Id: If0246daab39fa279c30874549b198e7aa917bc62 Signed-off-by: Matthias Sohn --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 46 files changed, 49 insertions(+), 49 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 1ce2ec27f..e216612e3 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 4.1.1.201511131810-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index ff1ec8335..9e6c7d67a 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index d9fbd7614..0e9ede4f1 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 4.1.1.201511131810-r Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[4.1.1,4.2.0)" diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 00351b901..2b03847c5 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 0d073188c..c3f51e980 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 4.1.1.201511131810-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 743fe11f0..dbb647366 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 4.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.1.1.qualifier";roots="." +Bundle-Version: 4.1.1.201511131810-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.1.1.201511131810-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 65e87aa68..1a4dcabea 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 107dc8449..6036cafbd 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 4.1.1.201511131810-r Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index f8b29ed4e..0bf73b796 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 90c15fc59..e19980b57 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 4.1.1.201511131810-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.http.server;version="4.1.1", diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index a487bd352..17ce3da12 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 8aaeeb032..d167da39f 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 4.1.1.201511131810-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 33a0f6d67..237f2267b 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 5f25bf194..f669a1790 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 4.1.1.201511131810-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 524afd664..d1e09c32a 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 48b8b12fe..31c2304b7 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 4.1.1.201511131810-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index d231bc1a2..b4d4d27f4 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index bfd343b0c..7cf81353f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 5bd71f734..849f7bbfa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index bb766ac23..8544d1a2b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 8dc47d0f9..060ad0e6f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index e28eac537..752f0444e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 99dd9bcb8..3ed76d384 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index f66c08934..a6f0a4c04 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index f078da6ec..438173bea 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml index 7a511cbfa..61070bff1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml index a1d785d06..3754fd6c9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 5e1ff4849..72da41c7e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index bfc552c3e..09ee4c478 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index dcc51618b..50816beaa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index 68b25b83d..1d3c436e9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 4.1.1.201511131810-r diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index 11ae4e9a2..e95377f94 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 1744cf247..64750ec37 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 01ebb4563..5b9a11534 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 4.1.1.201511131810-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 873bcde97..acfe6009f 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 62fcb68a6..30db7a84f 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 4.1.1.201511131810-r Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 7f815943a..dfc5ab9a9 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 4.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.1.1.qualifier";roots="." +Bundle-Version: 4.1.1.201511131810-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.1.1.201511131810-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 0007d0417..2c2e55de6 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 3b67921b7..9d25fca29 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 4.1.1.201511131810-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index d1a5a46b3..2385d27f9 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index b7f44277f..a9cedc091 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 4.1.1.201511131810-r Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: org.eclipse.jgit.awtui;version="4.1.1" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index a7a1992ab..d64de3243 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 43be20db1..a10e6d6ee 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 4.1.1.qualifier +Bundle-Version: 4.1.1.201511131810-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 07480e3c2..83b239cad 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 4.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="4.1.1.qualifier";roots="." +Bundle-Version: 4.1.1.201511131810-r +Eclipse-SourceBundle: org.eclipse.jgit;version="4.1.1.201511131810-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 52c702faa..875794062 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 5f911c6ba..a89978477 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 4.1.1-SNAPSHOT + 4.1.1.201511131810-r JGit - Parent ${jgit-url} From 3e2aff196e4f20183c13fd0c219101b6604477e8 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 14 Nov 2015 00:53:45 +0100 Subject: [PATCH 4/4] Prepare 4.1.2-SNAPSHOT builds Change-Id: I1d1c4d918f2260c866c4392c1abea1e40a1de962 Signed-off-by: Matthias Sohn --- .../META-INF/MANIFEST.MF | 12 +-- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 6 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 10 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 26 +++--- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 36 ++++----- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 ++--- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 32 ++++---- org.eclipse.jgit.junit/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 34 ++++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 64 +++++++-------- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 80 +++++++++---------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 ++--- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 74 ++++++++--------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 46 files changed, 248 insertions(+), 248 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index e216612e3..8f5d0b90d 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 4.1.1.201511131810-r +Bundle-Version: 4.1.2.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.junit;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util;version="[4.1.1,4.2.0)", + org.eclipse.jgit.ant.tasks;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.junit;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util;version="[4.1.2,4.2.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.junit;version="[4.0.0,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 9e6c7d67a..a514e3dbc 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 0e9ede4f1..4986f0fbb 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 4.1.1.201511131810-r +Bundle-Version: 4.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[4.1.1,4.2.0)" + org.eclipse.jgit.storage.file;version="[4.1.2,4.2.0)" Bundle-Localization: plugin Bundle-Vendor: %Provider-Name -Export-Package: org.eclipse.jgit.ant.tasks;version="4.1.1"; +Export-Package: org.eclipse.jgit.ant.tasks;version="4.1.2"; uses:="org.apache.tools.ant.types,org.apache.tools.ant" diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 2b03847c5..cb0fcb0a1 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index c3f51e980..4b1e81d40 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 4.1.1.201511131810-r +Bundle-Version: 4.1.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 @@ -12,14 +12,14 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.nls;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util;version="[4.1.1,4.2.0)", + org.eclipse.jgit.api;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.nls;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util;version="[4.1.2,4.2.0)", org.osgi.framework;version="[1.3.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="4.1.1"; +Export-Package: org.eclipse.jgit.archive;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index dbb647366..cc3181962 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 4.1.1.201511131810-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.1.1.201511131810-r";roots="." +Bundle-Version: 4.1.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.1.2.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 1a4dcabea..1127a773f 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 6036cafbd..700badbca 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 4.1.1.201511131810-r +Bundle-Version: 4.1.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name @@ -19,10 +19,10 @@ Import-Package: org.apache.http;version="[4.1.0,5.0.0)", org.apache.http.impl.client;version="[4.1.0,5.0.0)", org.apache.http.impl.client.cache;version="[4.1.0,5.0.0)", org.apache.http.params;version="[4.1.0,5.0.0)", - org.eclipse.jgit.nls;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport.http;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util;version="[4.1.1,4.2.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="4.1.1"; + org.eclipse.jgit.nls;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport.http;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util;version="[4.1.2,4.2.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="4.1.2"; uses:="org.eclipse.jgit.transport.http, javax.net.ssl, org.apache.http.client, diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 0bf73b796..dee349cd8 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index e19980b57..85e1dd7d4 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 4.1.1.201511131810-r +Bundle-Version: 4.1.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.http.server;version="4.1.1", - org.eclipse.jgit.http.server.glue;version="4.1.1"; +Export-Package: org.eclipse.jgit.http.server;version="4.1.2", + org.eclipse.jgit.http.server.glue;version="4.1.2"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="4.1.1"; + org.eclipse.jgit.http.server.resolver;version="4.1.2"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -17,12 +17,12 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: javax.servlet;version="[2.5.0,3.2.0)", javax.servlet.http;version="[2.5.0,3.2.0)", - org.eclipse.jgit.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.nls;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport.resolver;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util;version="[4.1.1,4.2.0)" + org.eclipse.jgit.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.nls;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport.resolver;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util;version="[4.1.2,4.2.0)" diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 17ce3da12..8707e0153 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index d167da39f..cff5d24fa 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 4.1.1.201511131810-r +Bundle-Version: 4.1.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 @@ -22,23 +22,23 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)", - org.eclipse.jgit.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.http.server;version="[4.1.1,4.2.0)", - org.eclipse.jgit.http.server.glue;version="[4.1.1,4.2.0)", - org.eclipse.jgit.http.server.resolver;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.junit;version="[4.1.1,4.2.0)", - org.eclipse.jgit.junit.http;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.nls;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport.http;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport.http.apache;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport.resolver;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util;version="[4.1.1,4.2.0)", + org.eclipse.jgit.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.http.server;version="[4.1.2,4.2.0)", + org.eclipse.jgit.http.server.glue;version="[4.1.2,4.2.0)", + org.eclipse.jgit.http.server.resolver;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.junit;version="[4.1.2,4.2.0)", + org.eclipse.jgit.junit.http;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.nls;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport.http;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport.http.apache;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport.resolver;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util;version="[4.1.2,4.2.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.0.0,5.0.0)", org.junit.runner;version="[4.0.0,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 237f2267b..8f7cd03fd 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index f669a1790..aa1dc8b2f 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 4.1.1.201511131810-r +Bundle-Version: 4.1.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -20,16 +20,16 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)", - org.eclipse.jgit.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.http.server;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.junit;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport.resolver;version="[4.1.1,4.2.0)", + org.eclipse.jgit.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.http.server;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.junit;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport.resolver;version="[4.1.2,4.2.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="4.1.1"; +Export-Package: org.eclipse.jgit.junit.http;version="4.1.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index d1e09c32a..40cdca158 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 31c2304b7..048f65d8f 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -2,27 +2,27 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 4.1.1.201511131810-r +Bundle-Version: 4.1.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.jgit.api;version="[4.1.1,4.2.0)", - org.eclipse.jgit.api.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.dircache;version="[4.1.1,4.2.0)", - org.eclipse.jgit.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.merge;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.treewalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.treewalk.filter;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util.io;version="[4.1.1,4.2.0)", +Import-Package: org.eclipse.jgit.api;version="[4.1.2,4.2.0)", + org.eclipse.jgit.api.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.dircache;version="[4.1.2,4.2.0)", + org.eclipse.jgit.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.merge;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.treewalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.treewalk.filter;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util.io;version="[4.1.2,4.2.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="4.1.1"; +Export-Package: org.eclipse.jgit.junit;version="4.1.2"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index b4d4d27f4..53f1bdcc8 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 7cf81353f..43575f525 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 849f7bbfa..f7ef5ee25 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 8544d1a2b..f54ec78c5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 060ad0e6f..8be8b18b9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 752f0444e..8dbf9f8a3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 3ed76d384..aa1d85cdc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index a6f0a4c04..084c49f16 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 438173bea..6010467d6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml index 61070bff1..8e13dc939 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml index 3754fd6c9..b72f82f45 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 72da41c7e..d7c1f6ad7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 09ee4c478..9a7e6e0ba 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 50816beaa..d71064311 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index 1d3c436e9..60492325c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 4.1.1.201511131810-r +Bundle-Version: 4.1.2.qualifier diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index e95377f94..e8e036ed4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 64750ec37..e1f71cbd7 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 5b9a11534..08a08a828 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -2,27 +2,27 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 4.1.1.201511131810-r +Bundle-Version: 4.1.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.jgit.api;version="[4.1.1,4.2.0)", - org.eclipse.jgit.api.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.diff;version="[4.1.1,4.2.0)", - org.eclipse.jgit.dircache;version="[4.1.1,4.2.0)", - org.eclipse.jgit.junit;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.merge;version="[4.1.1,4.2.0)", - org.eclipse.jgit.pgm;version="[4.1.1,4.2.0)", - org.eclipse.jgit.pgm.internal;version="[4.1.1,4.2.0)", - org.eclipse.jgit.pgm.opt;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport;version="[4.1.1,4.2.0)", - org.eclipse.jgit.treewalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util.io;version="[4.1.1,4.2.0)", +Import-Package: org.eclipse.jgit.api;version="[4.1.2,4.2.0)", + org.eclipse.jgit.api.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.diff;version="[4.1.2,4.2.0)", + org.eclipse.jgit.dircache;version="[4.1.2,4.2.0)", + org.eclipse.jgit.junit;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.merge;version="[4.1.2,4.2.0)", + org.eclipse.jgit.pgm;version="[4.1.2,4.2.0)", + org.eclipse.jgit.pgm.internal;version="[4.1.2,4.2.0)", + org.eclipse.jgit.pgm.opt;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport;version="[4.1.2,4.2.0)", + org.eclipse.jgit.treewalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util.io;version="[4.1.2,4.2.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.4.0,5.0.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)" diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index acfe6009f..132645b97 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 30db7a84f..3a78d94df 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 4.1.1.201511131810-r +Bundle-Version: 4.1.2.qualifier Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-Localization: plugin @@ -10,38 +10,38 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.apache.commons.compress.archivers;version="[1.3,2.0)", org.apache.commons.compress.archivers.tar;version="[1.3,2.0)", org.apache.commons.compress.archivers.zip;version="[1.3,2.0)", - org.eclipse.jgit.api;version="[4.1.1,4.2.0)", - org.eclipse.jgit.api.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.archive;version="[4.1.1,4.2.0)", - org.eclipse.jgit.awtui;version="[4.1.1,4.2.0)", - org.eclipse.jgit.blame;version="[4.1.1,4.2.0)", - org.eclipse.jgit.diff;version="[4.1.1,4.2.0)", - org.eclipse.jgit.dircache;version="[4.1.1,4.2.0)", - org.eclipse.jgit.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.gitrepo;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.merge;version="4.1.1", - org.eclipse.jgit.nls;version="[4.1.1,4.2.0)", - org.eclipse.jgit.notes;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revplot;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk.filter;version="[4.1.1,4.2.0)", - org.eclipse.jgit.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.storage.pack;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport.resolver;version="[4.1.1,4.2.0)", - org.eclipse.jgit.treewalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.treewalk.filter;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util.io;version="[4.1.1,4.2.0)", + org.eclipse.jgit.api;version="[4.1.2,4.2.0)", + org.eclipse.jgit.api.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.archive;version="[4.1.2,4.2.0)", + org.eclipse.jgit.awtui;version="[4.1.2,4.2.0)", + org.eclipse.jgit.blame;version="[4.1.2,4.2.0)", + org.eclipse.jgit.diff;version="[4.1.2,4.2.0)", + org.eclipse.jgit.dircache;version="[4.1.2,4.2.0)", + org.eclipse.jgit.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.gitrepo;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.merge;version="4.1.2", + org.eclipse.jgit.nls;version="[4.1.2,4.2.0)", + org.eclipse.jgit.notes;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revplot;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk.filter;version="[4.1.2,4.2.0)", + org.eclipse.jgit.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.storage.pack;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport.resolver;version="[4.1.2,4.2.0)", + org.eclipse.jgit.treewalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.treewalk.filter;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util.io;version="[4.1.2,4.2.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)", org.kohsuke.args4j.spi;version="[2.0.15,2.1.0)" -Export-Package: org.eclipse.jgit.console;version="4.1.1"; +Export-Package: org.eclipse.jgit.console;version="4.1.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="4.1.1"; + org.eclipse.jgit.pgm;version="4.1.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.pgm.opt, @@ -52,11 +52,11 @@ Export-Package: org.eclipse.jgit.console;version="4.1.1"; org.eclipse.jgit.treewalk, javax.swing, org.eclipse.jgit.transport", - org.eclipse.jgit.pgm.debug;version="4.1.1"; + org.eclipse.jgit.pgm.debug;version="4.1.2"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm", - org.eclipse.jgit.pgm.internal;version="4.1.1";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="4.1.1"; + org.eclipse.jgit.pgm.internal;version="4.1.2";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", + org.eclipse.jgit.pgm.opt;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.kohsuke.args4j.spi, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index dfc5ab9a9..303ebf44f 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 4.1.1.201511131810-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.1.1.201511131810-r";roots="." +Bundle-Version: 4.1.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.1.2.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 2c2e55de6..42fde6fe9 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 9d25fca29..8f2f4284f 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -2,51 +2,51 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 4.1.1.201511131810-r +Bundle-Version: 4.1.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", - org.eclipse.jgit.api;version="[4.1.1,4.2.0)", - org.eclipse.jgit.api.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.attributes;version="[4.1.1,4.2.0)", - org.eclipse.jgit.awtui;version="[4.1.1,4.2.0)", - org.eclipse.jgit.blame;version="[4.1.1,4.2.0)", - org.eclipse.jgit.diff;version="[4.1.1,4.2.0)", - org.eclipse.jgit.dircache;version="[4.1.1,4.2.0)", - org.eclipse.jgit.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.events;version="[4.1.1,4.2.0)", - org.eclipse.jgit.fnmatch;version="[4.1.1,4.2.0)", - org.eclipse.jgit.gitrepo;version="[4.1.1,4.2.0)", - org.eclipse.jgit.hooks;version="[4.1.1,4.2.0)", - org.eclipse.jgit.ignore;version="[4.1.1,4.2.0)", - org.eclipse.jgit.ignore.internal;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.1.1,4.2.0)", - org.eclipse.jgit.junit;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.merge;version="[4.1.1,4.2.0)", - org.eclipse.jgit.nls;version="[4.1.1,4.2.0)", - org.eclipse.jgit.notes;version="[4.1.1,4.2.0)", - org.eclipse.jgit.patch;version="[4.1.1,4.2.0)", - org.eclipse.jgit.pgm;version="[4.1.1,4.2.0)", - org.eclipse.jgit.pgm.internal;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revplot;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk.filter;version="[4.1.1,4.2.0)", - org.eclipse.jgit.storage.file;version="[4.1.1,4.2.0)", - org.eclipse.jgit.storage.pack;version="[4.1.1,4.2.0)", - org.eclipse.jgit.submodule;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport.http;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport.resolver;version="[4.1.1,4.2.0)", - org.eclipse.jgit.treewalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.treewalk.filter;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util.io;version="[4.1.1,4.2.0)", + org.eclipse.jgit.api;version="[4.1.2,4.2.0)", + org.eclipse.jgit.api.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.attributes;version="[4.1.2,4.2.0)", + org.eclipse.jgit.awtui;version="[4.1.2,4.2.0)", + org.eclipse.jgit.blame;version="[4.1.2,4.2.0)", + org.eclipse.jgit.diff;version="[4.1.2,4.2.0)", + org.eclipse.jgit.dircache;version="[4.1.2,4.2.0)", + org.eclipse.jgit.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.events;version="[4.1.2,4.2.0)", + org.eclipse.jgit.fnmatch;version="[4.1.2,4.2.0)", + org.eclipse.jgit.gitrepo;version="[4.1.2,4.2.0)", + org.eclipse.jgit.hooks;version="[4.1.2,4.2.0)", + org.eclipse.jgit.ignore;version="[4.1.2,4.2.0)", + org.eclipse.jgit.ignore.internal;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.1.2,4.2.0)", + org.eclipse.jgit.junit;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.merge;version="[4.1.2,4.2.0)", + org.eclipse.jgit.nls;version="[4.1.2,4.2.0)", + org.eclipse.jgit.notes;version="[4.1.2,4.2.0)", + org.eclipse.jgit.patch;version="[4.1.2,4.2.0)", + org.eclipse.jgit.pgm;version="[4.1.2,4.2.0)", + org.eclipse.jgit.pgm.internal;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revplot;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk.filter;version="[4.1.2,4.2.0)", + org.eclipse.jgit.storage.file;version="[4.1.2,4.2.0)", + org.eclipse.jgit.storage.pack;version="[4.1.2,4.2.0)", + org.eclipse.jgit.submodule;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport.http;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport.resolver;version="[4.1.2,4.2.0)", + org.eclipse.jgit.treewalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.treewalk.filter;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util.io;version="[4.1.2,4.2.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.junit;version="[4.4.0,5.0.0)", org.junit.experimental.theories;version="[4.4.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 2385d27f9..c174ba270 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index a9cedc091..3df434701 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 4.1.1.201511131810-r +Bundle-Version: 4.1.2.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Export-Package: org.eclipse.jgit.awtui;version="4.1.1" -Import-Package: org.eclipse.jgit.errors;version="[4.1.1,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", - org.eclipse.jgit.nls;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revplot;version="[4.1.1,4.2.0)", - org.eclipse.jgit.revwalk;version="[4.1.1,4.2.0)", - org.eclipse.jgit.transport;version="[4.1.1,4.2.0)", - org.eclipse.jgit.util;version="[4.1.1,4.2.0)" +Export-Package: org.eclipse.jgit.awtui;version="4.1.2" +Import-Package: org.eclipse.jgit.errors;version="[4.1.2,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.2,4.2.0)", + org.eclipse.jgit.nls;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revplot;version="[4.1.2,4.2.0)", + org.eclipse.jgit.revwalk;version="[4.1.2,4.2.0)", + org.eclipse.jgit.transport;version="[4.1.2,4.2.0)", + org.eclipse.jgit.util;version="[4.1.2,4.2.0)" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index d64de3243..79c30f0ac 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index a10e6d6ee..24798be02 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 4.1.1.201511131810-r +Bundle-Version: 4.1.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jgit.api;version="4.1.1"; +Export-Package: org.eclipse.jgit.api;version="4.1.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, @@ -20,60 +20,60 @@ Export-Package: org.eclipse.jgit.api;version="4.1.1"; org.eclipse.jgit.submodule, org.eclipse.jgit.transport, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="4.1.1"; + org.eclipse.jgit.api.errors;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="4.1.1", - org.eclipse.jgit.blame;version="4.1.1"; + org.eclipse.jgit.attributes;version="4.1.2", + org.eclipse.jgit.blame;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="4.1.1"; + org.eclipse.jgit.diff;version="4.1.2"; uses:="org.eclipse.jgit.patch, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="4.1.1"; + org.eclipse.jgit.dircache;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.util, org.eclipse.jgit.events, org.eclipse.jgit.attributes", - org.eclipse.jgit.errors;version="4.1.1"; + org.eclipse.jgit.errors;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack, org.eclipse.jgit.transport, org.eclipse.jgit.dircache", - org.eclipse.jgit.events;version="4.1.1"; + org.eclipse.jgit.events;version="4.1.2"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="4.1.1", - org.eclipse.jgit.gitrepo;version="4.1.1"; + org.eclipse.jgit.fnmatch;version="4.1.2", + org.eclipse.jgit.gitrepo;version="4.1.2"; uses:="org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax.helpers, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="4.1.1";x-internal:=true, - org.eclipse.jgit.hooks;version="4.1.1"; + org.eclipse.jgit.gitrepo.internal;version="4.1.2";x-internal:=true, + org.eclipse.jgit.hooks;version="4.1.2"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="4.1.1", - org.eclipse.jgit.ignore.internal;version="4.1.1";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="4.1.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.storage.dfs;version="4.1.1"; + org.eclipse.jgit.ignore;version="4.1.2", + org.eclipse.jgit.ignore.internal;version="4.1.2";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal;version="4.1.2";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.storage.dfs;version="4.1.2"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server", - org.eclipse.jgit.internal.storage.file;version="4.1.1"; + org.eclipse.jgit.internal.storage.file;version="4.1.2"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, org.eclipse.jgit.http.server, org.eclipse.jgit.java7.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="4.1.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.lib;version="4.1.1"; + org.eclipse.jgit.internal.storage.pack;version="4.1.2";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.lib;version="4.1.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, @@ -83,45 +83,45 @@ Export-Package: org.eclipse.jgit.api;version="4.1.1"; org.eclipse.jgit.treewalk, org.eclipse.jgit.transport, org.eclipse.jgit.submodule", - org.eclipse.jgit.merge;version="4.1.1"; + org.eclipse.jgit.merge;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff, org.eclipse.jgit.dircache, org.eclipse.jgit.api", - org.eclipse.jgit.nls;version="4.1.1", - org.eclipse.jgit.notes;version="4.1.1"; + org.eclipse.jgit.nls;version="4.1.2", + org.eclipse.jgit.notes;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="4.1.1"; + org.eclipse.jgit.patch;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="4.1.1"; + org.eclipse.jgit.revplot;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="4.1.1"; + org.eclipse.jgit.revwalk;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.revwalk.filter", - org.eclipse.jgit.revwalk.filter;version="4.1.1"; + org.eclipse.jgit.revwalk.filter;version="4.1.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="4.1.1"; + org.eclipse.jgit.storage.file;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="4.1.1"; + org.eclipse.jgit.storage.pack;version="4.1.2"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="4.1.1"; + org.eclipse.jgit.submodule;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk", - org.eclipse.jgit.transport;version="4.1.1"; + org.eclipse.jgit.transport;version="4.1.2"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.revwalk, org.eclipse.jgit.internal.storage.pack, @@ -133,26 +133,26 @@ Export-Package: org.eclipse.jgit.api;version="4.1.1"; org.eclipse.jgit.transport.http, org.eclipse.jgit.errors, org.eclipse.jgit.storage.pack", - org.eclipse.jgit.transport.http;version="4.1.1"; + org.eclipse.jgit.transport.http;version="4.1.2"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="4.1.1"; + org.eclipse.jgit.transport.resolver;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.transport", - org.eclipse.jgit.treewalk;version="4.1.1"; + org.eclipse.jgit.treewalk;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, org.eclipse.jgit.dircache", - org.eclipse.jgit.treewalk.filter;version="4.1.1"; + org.eclipse.jgit.treewalk.filter;version="4.1.2"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="4.1.1"; + org.eclipse.jgit.util;version="4.1.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.transport.http, org.eclipse.jgit.storage.file, org.ietf.jgss", - org.eclipse.jgit.util.io;version="4.1.1" + org.eclipse.jgit.util.io;version="4.1.2" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)", org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 83b239cad..c5476a85c 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 4.1.1.201511131810-r -Eclipse-SourceBundle: org.eclipse.jgit;version="4.1.1.201511131810-r";roots="." +Bundle-Version: 4.1.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="4.1.2.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 875794062..8791389da 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index a89978477..760d66fdb 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 4.1.1.201511131810-r + 4.1.2-SNAPSHOT JGit - Parent ${jgit-url}