diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index 1377335d2..75ae5be23 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: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.ant.tasks;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.junit;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.ant.tasks;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.junit;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.util;version="[3.1.1,3.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 359d47715..192d2122f 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
- 3.1.0-SNAPSHOT
+ 3.1.1-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 30d98d392..9f82424e5 100644
--- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.jgit.ant
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)"
+ org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)"
Bundle-Localization: plugin
Bundle-Vendor: %Provider-Name
-Export-Package: org.eclipse.jgit.ant.tasks;version="3.1.0"
+Export-Package: org.eclipse.jgit.ant.tasks;version="3.1.1"
diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml
index e6d0e8a0d..875a9caf8 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
- 3.1.0-SNAPSHOT
+ 3.1.1-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 d8626e8a0..941d50b77 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: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -12,9 +12,9 @@ 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="[3.1.0,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.api;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.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="3.1.0"
+Export-Package: org.eclipse.jgit.archive;version="3.1.1"
diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
index c41c426fb..79404209b 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;singleton:=true
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 3.1.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.1.0";roots="."
+Bundle-Version: 3.1.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.1.1";roots="."
diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml
index 797c785ec..5bb6c68cc 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
- 3.1.0-SNAPSHOT
+ 3.1.1-SNAPSHOT
org.eclipse.jgit.archive
diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF
index d1751751b..7e15459f2 100644
--- a/org.eclipse.jgit.console/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.console/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.console
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-Vendor: %provider_name
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.jgit.console;version="3.1.0"
-Import-Package: org.eclipse.jgit.errors;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.nls;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.transport;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)"
+Export-Package: org.eclipse.jgit.console;version="3.1.1"
+Import-Package: org.eclipse.jgit.errors;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.nls;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.transport;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)"
diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml
index 009ee5c8f..c78ef992b 100644
--- a/org.eclipse.jgit.console/pom.xml
+++ b/org.eclipse.jgit.console/pom.xml
@@ -52,7 +52,7 @@
org.eclipse.jgit
org.eclipse.jgit-parent
- 3.1.0-SNAPSHOT
+ 3.1.1-SNAPSHOT
org.eclipse.jgit.console
diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index e39754928..0e50451a7 100644
--- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.http.server
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Export-Package:
- org.eclipse.jgit.http.server;version="3.1.0",
- org.eclipse.jgit.http.server.glue;version="3.1.0",
- org.eclipse.jgit.http.server.resolver;version="3.1.0"
+ org.eclipse.jgit.http.server;version="3.1.1",
+ org.eclipse.jgit.http.server.glue;version="3.1.1",
+ org.eclipse.jgit.http.server.resolver;version="3.1.1"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
javax.servlet.http;version="[2.5.0,3.0.0)",
- org.eclipse.jgit.errors;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.nls;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.transport;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.transport.resolver;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)"
+ org.eclipse.jgit.errors;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.nls;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.transport;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.transport.resolver;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)"
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index 9f47c1a10..f71b2f8d2 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
- 3.1.0-SNAPSHOT
+ 3.1.1-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 d9b86a11f..e54114add 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: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -22,20 +22,20 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)",
org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)",
org.eclipse.jetty.util.thread;version="[7.6.0,8.0.0)",
- org.eclipse.jgit.errors;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.http.server;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.http.server.glue;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.http.server.resolver;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.internal;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.junit;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.junit.http;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.nls;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.transport;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.transport.resolver;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.errors;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.http.server;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.http.server.glue;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.http.server.resolver;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.internal;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.junit;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.junit.http;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.nls;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.transport;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.transport.resolver;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;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 c24ef1c87..f5aa03cbd 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
- 3.1.0-SNAPSHOT
+ 3.1.1-SNAPSHOT
org.eclipse.jgit.http.test
diff --git a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF
index 78764801c..b3c9bde9c 100644
--- a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.java7.test
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-Vendor: %provider_name
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: org.eclipse.jgit.api;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.internal.storage.file;version="3.1.0",
- org.eclipse.jgit.junit;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)"
+Import-Package: org.eclipse.jgit.api;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.internal.storage.file;version="3.1.1",
+ org.eclipse.jgit.junit;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)"
diff --git a/org.eclipse.jgit.java7.test/pom.xml b/org.eclipse.jgit.java7.test/pom.xml
index 1762e4450..b6cbf8451 100644
--- a/org.eclipse.jgit.java7.test/pom.xml
+++ b/org.eclipse.jgit.java7.test/pom.xml
@@ -50,7 +50,7 @@
org.eclipse.jgit
org.eclipse.jgit-parent
- 3.1.0-SNAPSHOT
+ 3.1.1-SNAPSHOT
org.eclipse.jgit.java7.test
diff --git a/org.eclipse.jgit.java7/META-INF/MANIFEST.MF b/org.eclipse.jgit.java7/META-INF/MANIFEST.MF
index 7a0c21282..553d004e1 100644
--- a/org.eclipse.jgit.java7/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.java7/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Fragment-Host: org.eclipse.jgit;bundle-version="3.1.0"
+Fragment-Host: org.eclipse.jgit;bundle-version="3.1.1"
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.java7
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: org.eclipse.jgit.util;version="3.1.0"
+Export-Package: org.eclipse.jgit.util;version="3.1.1"
diff --git a/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF
index 8db0b33c8..125a9dcab 100644
--- a/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.jgit.java7 - Sources
Bundle-SymbolicName: org.eclipse.jgit.java7.source;singleton:=true
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 3.1.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.1.0";roots="."
+Bundle-Version: 3.1.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.1.1";roots="."
diff --git a/org.eclipse.jgit.java7/pom.xml b/org.eclipse.jgit.java7/pom.xml
index 235861e42..bf501b5c0 100644
--- a/org.eclipse.jgit.java7/pom.xml
+++ b/org.eclipse.jgit.java7/pom.xml
@@ -50,7 +50,7 @@
org.eclipse.jgit
org.eclipse.jgit-parent
- 3.1.0-SNAPSHOT
+ 3.1.1-SNAPSHOT
org.eclipse.jgit.java7
diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index 723b7934d..26cfd76d1 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: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
@@ -19,13 +19,13 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
org.eclipse.jetty.util.component;version="[7.6.0,8.0.0)",
org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)",
org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)",
- org.eclipse.jgit.errors;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.http.server;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.junit;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.transport;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.transport.resolver;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.errors;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.http.server;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.junit;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.transport;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.transport.resolver;version="[3.1.1,3.2.0)",
org.junit;version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.jgit.junit.http;version="3.1.0"
+Export-Package: org.eclipse.jgit.junit.http;version="3.1.1"
diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml
index d9bfb831a..c8734bdb2 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
- 3.1.0-SNAPSHOT
+ 3.1.1-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 bc4e4f83a..f3b53493f 100644
--- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.junit
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.jgit.api;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.api.errors;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.dircache;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.errors;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.internal.storage.pack;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.treewalk;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.treewalk.filter;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.util.io;version="[3.1.0,3.2.0)",
+Import-Package: org.eclipse.jgit.api;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.api.errors;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.dircache;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.errors;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.treewalk;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.treewalk.filter;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.util.io;version="[3.1.1,3.2.0)",
org.junit;version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.jgit.junit;version="3.1.0"
+Export-Package: org.eclipse.jgit.junit;version="3.1.1"
diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml
index 76a330b04..82da022dd 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
- 3.1.0-SNAPSHOT
+ 3.1.1-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 9f6719261..ef427fdd7 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 f7d83f6d4..e516be84c 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
- 3.1.0-SNAPSHOT
+ 3.1.1-SNAPSHOT
org.eclipse.jgit.feature
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml
index 0460f5d7a..cdf88e3a9 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml
@@ -2,7 +2,7 @@
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml
index 9e0c1c74a..2fe4c8d98 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml
@@ -50,7 +50,7 @@
org.eclipse.jgit
jgit.tycho.parent
- 3.1.0-SNAPSHOT
+ 3.1.1-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 dcd67e3e8..b589b85c5 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 3fefc0bf8..a229f288d 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
- 3.1.0-SNAPSHOT
+ 3.1.1-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 a97ec5719..ab77e7a4a 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 @@
@@ -27,7 +27,7 @@
version="0.0.0"/>
-
+
org.eclipse.jgit
jgit.tycho.parent
- 3.1.0-SNAPSHOT
+ 3.1.1-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 f7b786624..eebb32204 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 9c665c3d7..1e86f8298 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
- 3.1.0-SNAPSHOT
+ 3.1.1-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 22d4d5759..1e52130a3 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
- 3.1.0-SNAPSHOT
+ 3.1.1-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 b072103db..48070d233 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 0b53fb988..803d1d569 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
- 3.1.0-SNAPSHOT
+ 3.1.1-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 72b4df879..f2448ff52 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: 3.1.0.qualifier
+Bundle-Version: 3.1.1.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 df8bacc03..118d1e2ec 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
- 3.1.0-SNAPSHOT
+ 3.1.1-SNAPSHOT
org.eclipse.jgit.target
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index b5bb59df8..6b1a6547d 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
- 3.1.0-SNAPSHOT
+ 3.1.1-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 bfad29244..5ba2186bf 100644
--- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.pgm.test
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.jgit.api;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.dircache;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.java7;version="[3.1.0,3.2.0)";resolution:=optional,
- org.eclipse.jgit.junit;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.merge;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.pgm;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.pgm.internal;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.pgm.opt;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.util.io;version="[3.1.0,3.2.0)",
+Import-Package: org.eclipse.jgit.api;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.dircache;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.java7;version="[3.1.1,3.2.0)";resolution:=optional,
+ org.eclipse.jgit.junit;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.merge;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.pgm;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.pgm.internal;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.pgm.opt;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.util.io;version="[3.1.1,3.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 bf08d7cd8..28e0d0986 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
- 3.1.0-SNAPSHOT
+ 3.1.1-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 a6cf0f892..f04011e68 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -2,42 +2,42 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.pgm
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
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="[3.1.0,3.2.0)",
- org.eclipse.jgit.api.errors;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.archive;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.awtui;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.blame;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.diff;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.dircache;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.errors;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.internal.storage.pack;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.merge;version="3.1.0",
- org.eclipse.jgit.nls;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.notes;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.revplot;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.revwalk.filter;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.storage.pack;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.transport;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.transport.resolver;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.treewalk;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.treewalk.filter;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.util.io;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.api;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.api.errors;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.archive;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.awtui;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.blame;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.diff;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.dircache;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.errors;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.merge;version="3.1.1",
+ org.eclipse.jgit.nls;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.notes;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.revplot;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.revwalk.filter;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.storage.pack;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.transport;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.transport.resolver;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.treewalk;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.treewalk.filter;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.util.io;version="[3.1.1,3.2.0)",
org.kohsuke.args4j;version="[2.0.12,2.1.0)",
org.kohsuke.args4j.spi;version="[2.0.12,2.1.0)"
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.jgit.pgm;version="3.1.0";
+Export-Package: org.eclipse.jgit.pgm;version="3.1.1";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.nls,
org.eclipse.jgit.treewalk,
@@ -46,8 +46,8 @@ Export-Package: org.eclipse.jgit.pgm;version="3.1.0";
org.eclipse.jgit.pgm.opt,
org.eclipse.jgit.awtui,
org.eclipse.jgit.transport",
- org.eclipse.jgit.pgm.debug;version="3.1.0",
- org.eclipse.jgit.pgm.internal;version="3.1.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test",
- org.eclipse.jgit.pgm.opt;version="3.1.0"
+ org.eclipse.jgit.pgm.debug;version="3.1.1",
+ org.eclipse.jgit.pgm.internal;version="3.1.1";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test",
+ org.eclipse.jgit.pgm.opt;version="3.1.1"
Main-Class: org.eclipse.jgit.pgm.Main
Implementation-Title: JGit Command Line Interface
diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
index 905f5c484..44666edbd 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;singleton:=true
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 3.1.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.1.0";roots="."
+Bundle-Version: 3.1.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.1.1";roots="."
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index ff80bebf0..19d73c08c 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
- 3.1.0-SNAPSHOT
+ 3.1.1-SNAPSHOT
org.eclipse.jgit.pgm
@@ -178,6 +178,20 @@
+
+
+
+ *:*
+
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+ OSGI-OPT/**
+
+
+
+ true
+ shaded
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index aff1abb6b..f0764b547 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -2,47 +2,47 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.test
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: javaewah;version="[0.5.6,1.0.0)",
- org.eclipse.jgit.api;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.api.errors;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.awtui;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.blame;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.console;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.diff;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.dircache;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.errors;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.events;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.fnmatch;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.ignore;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.internal;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.internal.storage.pack;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.java7;version="[3.1.0,3.2.0)";resolution:=optional,
- org.eclipse.jgit.junit;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.merge;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.nls;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.notes;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.patch;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.pgm;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.pgm.internal;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.revplot;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.revwalk.filter;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.storage.pack;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.submodule;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.transport;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.treewalk;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.treewalk.filter;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.util.io;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.api;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.api.errors;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.awtui;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.blame;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.console;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.diff;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.dircache;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.errors;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.events;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.fnmatch;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.ignore;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.internal;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.java7;version="[3.1.1,3.2.0)";resolution:=optional,
+ org.eclipse.jgit.junit;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.merge;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.nls;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.notes;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.patch;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.pgm;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.pgm.internal;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.revplot;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.revwalk.filter;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.storage.pack;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.submodule;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.transport;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.treewalk;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.treewalk.filter;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.util.io;version="[3.1.1,3.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 7b9f4ca41..435bd8d0a 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
- 3.1.0-SNAPSHOT
+ 3.1.1-SNAPSHOT
org.eclipse.jgit.test
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revplot/PlotCommitListTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revplot/PlotCommitListTest.java
index 5db6b86f8..926424c06 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revplot/PlotCommitListTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revplot/PlotCommitListTest.java
@@ -156,8 +156,8 @@ public void testSideBranch() throws Exception {
CommitListAssert test = new CommitListAssert(pcl);
test.commit(c).lanePos(0).parents(a);
- test.commit(b).lanePos(1).parents(a);
- test.commit(a).lanePos(0).parents();
+ test.commit(b).lanePos(0).parents(a);
+ test.commit(a).lanePos(1).parents();
test.noMoreCommits();
}
@@ -179,9 +179,9 @@ public void test2SideBranches() throws Exception {
CommitListAssert test = new CommitListAssert(pcl);
test.commit(d).lanePos(0).parents(a);
- test.commit(c).lanePos(1).parents(a);
- test.commit(b).lanePos(1).parents(a);
- test.commit(a).lanePos(0).parents();
+ test.commit(c).lanePos(0).parents(a);
+ test.commit(b).lanePos(0).parents(a);
+ test.commit(a).lanePos(1).parents();
test.noMoreCommits();
}
@@ -214,14 +214,45 @@ public void testBug300282_1() throws Exception {
CommitListAssert test = new CommitListAssert(pcl);
test.commit(g).lanePos(0).parents(f);
test.commit(f).lanePos(0).parents(a);
- test.commit(e).lanePos(1).parents(a);
- test.commit(d).lanePos(1).parents(a);
- test.commit(c).lanePos(1).parents(a);
- test.commit(b).lanePos(1).parents(a);
- test.commit(a).lanePos(0).parents();
+ test.commit(e).lanePos(0).parents(a);
+ test.commit(d).lanePos(0).parents(a);
+ test.commit(c).lanePos(0).parents(a);
+ test.commit(b).lanePos(0).parents(a);
+ test.commit(a).lanePos(1).parents();
test.noMoreCommits();
}
+ @Test
+ public void testBug368927() throws Exception {
+ final RevCommit a = commit();
+ final RevCommit b = commit(a);
+ final RevCommit c = commit(b);
+ final RevCommit d = commit(b);
+ final RevCommit e = commit(c);
+ final RevCommit f = commit(e, d);
+ final RevCommit g = commit(a);
+ final RevCommit h = commit(f);
+ final RevCommit i = commit(h);
+
+ PlotWalk pw = new PlotWalk(db);
+ pw.markStart(pw.lookupCommit(i.getId()));
+ pw.markStart(pw.lookupCommit(g.getId()));
+
+ PlotCommitList pcl = new PlotCommitList();
+ pcl.source(pw);
+ pcl.fillTo(Integer.MAX_VALUE);
+ CommitListAssert test = new CommitListAssert(pcl);
+ test.commit(i).lanePos(1).parents(h);
+ test.commit(h).lanePos(1).parents(f);
+ test.commit(g).lanePos(0).parents(a);
+ test.commit(f).lanePos(1).parents(e, d);
+ test.commit(e).lanePos(0).parents(c);
+ test.commit(d).lanePos(1).parents(b);
+ test.commit(c).lanePos(0).parents(b);
+ test.commit(b).lanePos(1).parents(a);
+ test.commit(a).lanePos(2).parents();
+ }
+
// test the history of the egit project between 9fdaf3c1 and e76ad9170f
@Test
public void testEgitHistory() throws Exception {
diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index bb72a3189..d4b1fa7c8 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: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-Vendor: %provider_name
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.jgit.awtui;version="3.1.0"
-Import-Package: org.eclipse.jgit.errors;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.nls;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.revplot;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.transport;version="[3.1.0,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)"
+Export-Package: org.eclipse.jgit.awtui;version="3.1.1"
+Import-Package: org.eclipse.jgit.errors;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.nls;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.revplot;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.transport;version="[3.1.1,3.2.0)",
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)"
diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml
index 5d3b79af6..cc5d4fd26 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
- 3.1.0-SNAPSHOT
+ 3.1.1-SNAPSHOT
org.eclipse.jgit.ui
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 4f6d874bf..afb46a1e0 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -2,50 +2,50 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
-Export-Package: org.eclipse.jgit.api;version="3.1.0",
- org.eclipse.jgit.api.errors;version="3.1.0",
- org.eclipse.jgit.blame;version="3.1.0",
- org.eclipse.jgit.diff;version="3.1.0",
- org.eclipse.jgit.dircache;version="3.1.0",
- org.eclipse.jgit.errors;version="3.1.0",
- org.eclipse.jgit.events;version="3.1.0",
- org.eclipse.jgit.fnmatch;version="3.1.0",
- org.eclipse.jgit.ignore;version="3.1.0",
- org.eclipse.jgit.internal;version="3.1.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
- org.eclipse.jgit.internal.storage.dfs;version="3.1.0";x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.storage.file;version="3.1.0";
+Export-Package: org.eclipse.jgit.api;version="3.1.1",
+ org.eclipse.jgit.api.errors;version="3.1.1",
+ org.eclipse.jgit.blame;version="3.1.1",
+ org.eclipse.jgit.diff;version="3.1.1",
+ org.eclipse.jgit.dircache;version="3.1.1",
+ org.eclipse.jgit.errors;version="3.1.1",
+ org.eclipse.jgit.events;version="3.1.1",
+ org.eclipse.jgit.fnmatch;version="3.1.1",
+ org.eclipse.jgit.ignore;version="3.1.1",
+ org.eclipse.jgit.internal;version="3.1.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
+ org.eclipse.jgit.internal.storage.dfs;version="3.1.1";x-friends:="org.eclipse.jgit.test",
+ org.eclipse.jgit.internal.storage.file;version="3.1.1";
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="3.1.0";
+ org.eclipse.jgit.internal.storage.pack;version="3.1.1";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.pack;version="3.1.0";
+ org.eclipse.jgit.internal.storage.pack;version="3.1.1";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.lib;version="3.1.0",
- org.eclipse.jgit.merge;version="3.1.0",
- org.eclipse.jgit.nls;version="3.1.0",
- org.eclipse.jgit.notes;version="3.1.0",
- org.eclipse.jgit.patch;version="3.1.0",
- org.eclipse.jgit.revplot;version="3.1.0",
- org.eclipse.jgit.revwalk;version="3.1.0",
- org.eclipse.jgit.revwalk.filter;version="3.1.0",
- org.eclipse.jgit.storage.file;version="3.1.0",
- org.eclipse.jgit.storage.pack;version="3.1.0",
- org.eclipse.jgit.submodule;version="3.1.0",
- org.eclipse.jgit.transport;version="3.1.0",
- org.eclipse.jgit.transport.resolver;version="3.1.0",
- org.eclipse.jgit.treewalk;version="3.1.0",
- org.eclipse.jgit.treewalk.filter;version="3.1.0",
- org.eclipse.jgit.util;version="3.1.0",
- org.eclipse.jgit.util.io;version="3.1.0"
+ org.eclipse.jgit.lib;version="3.1.1",
+ org.eclipse.jgit.merge;version="3.1.1",
+ org.eclipse.jgit.nls;version="3.1.1",
+ org.eclipse.jgit.notes;version="3.1.1",
+ org.eclipse.jgit.patch;version="3.1.1",
+ org.eclipse.jgit.revplot;version="3.1.1",
+ org.eclipse.jgit.revwalk;version="3.1.1",
+ org.eclipse.jgit.revwalk.filter;version="3.1.1",
+ org.eclipse.jgit.storage.file;version="3.1.1",
+ org.eclipse.jgit.storage.pack;version="3.1.1",
+ org.eclipse.jgit.submodule;version="3.1.1",
+ org.eclipse.jgit.transport;version="3.1.1",
+ org.eclipse.jgit.transport.resolver;version="3.1.1",
+ org.eclipse.jgit.treewalk;version="3.1.1",
+ org.eclipse.jgit.treewalk.filter;version="3.1.1",
+ org.eclipse.jgit.util;version="3.1.1",
+ org.eclipse.jgit.util.io;version="3.1.1"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"
diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
index 20968e8c7..10c561072 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;singleton:=true
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 3.1.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit;version="3.1.0";roots="."
+Bundle-Version: 3.1.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit;version="3.1.1";roots="."
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index ca0d73a66..88c387487 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -53,7 +53,7 @@
org.eclipse.jgit
org.eclipse.jgit-parent
- 3.1.0-SNAPSHOT
+ 3.1.1-SNAPSHOT
org.eclipse.jgit
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
index 5a006792e..a3f80c0f0 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
@@ -669,8 +669,8 @@ else if (!isInteractive() && walk.isMergedInto(headCommit, upstream)) {
BufferedWriter fw = new BufferedWriter(new OutputStreamWriter(
new FileOutputStream(rebaseState.getFile(GIT_REBASE_TODO)),
Constants.CHARACTER_ENCODING));
- fw.write("# Created by EGit: rebasing " + upstreamCommit.name()
- + " onto " + headId.name());
+ fw.write("# Created by EGit: rebasing " + headId.name() + " onto "
+ + upstreamCommit.name());
fw.newLine();
try {
StringBuilder sb = new StringBuilder();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchTrackingStatus.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchTrackingStatus.java
index 7844fd819..1525e5b18 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchTrackingStatus.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchTrackingStatus.java
@@ -70,8 +70,10 @@ public class BranchTrackingStatus {
public static BranchTrackingStatus of(Repository repository, String branchName)
throws IOException {
+ String shortBranchName = Repository.shortenRefName(branchName);
+ String fullBranchName = Constants.R_HEADS + shortBranchName;
BranchConfig branchConfig = new BranchConfig(repository.getConfig(),
- branchName);
+ shortBranchName);
String trackingBranch = branchConfig.getTrackingBranch();
if (trackingBranch == null)
@@ -81,7 +83,7 @@ public static BranchTrackingStatus of(Repository repository, String branchName)
if (tracking == null)
return null;
- Ref local = repository.getRef(branchName);
+ Ref local = repository.getRef(fullBranchName);
if (local == null)
return null;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java
index 382d16243..943ec4ec3 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java
@@ -119,8 +119,12 @@ protected void enter(final int index, final PlotCommit currCommit) {
setupChildren(currCommit);
final int nChildren = currCommit.getChildCount();
- if (nChildren == 0)
+ if (nChildren == 0) {
+ currCommit.lane = nextFreeLane();
+ activeLanes.add(currCommit.lane);
+ closeLane(currCommit.lane);
return;
+ }
if (nChildren == 1 && currCommit.children[0].getParentCount() < 2) {
// Only one child, child has only us as their parent.
diff --git a/pom.xml b/pom.xml
index 087c6db2c..6287c26ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
org.eclipse.jgit
org.eclipse.jgit-parent
pom
- 3.1.0-SNAPSHOT
+ 3.1.1-SNAPSHOT
JGit - Parent
${jgit-url}