Merge branch 'stable-3.1'

* stable-3.1:
  Prepare post 3.1.0 builds
  JGit v3.1.0.201310021548-r
  Fix order of commits in rebase todo file header
  Prepare post 3.1.0 RC1 builds
  JGit v3.1.0.201309270735-rc1
  Attempt to fix graph layout when new heads are introduced
  Prepare re-signing pgm's ueberjar to avoid SecurityException
  Use full branch name when getting ref in BranchTrackingStatus

Change-Id: Ida30175d0c058048cbe4b563aae7f85cd008db29
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

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.ant.tasks;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.junit;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.junit;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,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)"

org.eclipse.jgit.ant.test/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ant.test</artifactId>

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"

org.eclipse.jgit.ant/pom.xml

@@ -48,7 +48,7 @@
 	<parent>
 		<groupId>org.eclipse.jgit</groupId>
 		<artifactId>org.eclipse.jgit-parent</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>3.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.jgit.ant</artifactId>

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.api;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,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"

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
+Bundle-Version: 3.1.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.1.0";roots="."
+Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.1.1";roots="."

org.eclipse.jgit.archive/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.archive</artifactId>

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"
+Export-Package: org.eclipse.jgit.console;version="3.1.1"
-Import-Package: org.eclipse.jgit.errors;version="[3.1.0,3.2.0)",
+Import-Package: org.eclipse.jgit.errors;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.nls;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.nls;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.transport;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.transport;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)"
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)"

org.eclipse.jgit.console/pom.xml

@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.console</artifactId>

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;version="3.1.1",
- org.eclipse.jgit.http.server.glue;version="3.1.0",
+ org.eclipse.jgit.http.server.glue;version="3.1.1",
- org.eclipse.jgit.http.server.resolver;version="3.1.0"
+ 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.errors;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.nls;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.nls;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.transport;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.transport;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.transport.resolver;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.transport.resolver;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)"
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)"

org.eclipse.jgit.http.server/pom.xml

@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.http.server</artifactId>

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.errors;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.http.server;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.http.server;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.http.server.glue;version="[3.1.0,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.0,3.2.0)",
+ org.eclipse.jgit.http.server.resolver;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.internal;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.internal;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.junit;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.junit;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.junit.http;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.junit.http;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.nls;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.nls;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.transport;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.transport;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.transport.resolver;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.transport.resolver;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,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)"

org.eclipse.jgit.http.test/pom.xml

@@ -51,7 +51,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.http.test</artifactId>

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)",
+Import-Package: org.eclipse.jgit.api;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.internal.storage.file;version="3.1.0",
+ org.eclipse.jgit.internal.storage.file;version="3.1.1",
- org.eclipse.jgit.junit;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.junit;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)"
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)"

org.eclipse.jgit.java7.test/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.java7.test</artifactId>

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"

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
+Bundle-Version: 3.1.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.1.0";roots="."
+Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.1.1";roots="."
 

org.eclipse.jgit.java7/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.java7</artifactId>

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.errors;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.http.server;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.http.server;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.junit;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.junit;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.transport;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.transport;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.transport.resolver;version="[3.1.0,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"

org.eclipse.jgit.junit.http/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.junit.http</artifactId>

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)",
+Import-Package: org.eclipse.jgit.api;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.api.errors;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.api.errors;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.dircache;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.dircache;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.errors;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.0,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.0,3.2.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.treewalk;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.treewalk;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.treewalk.filter;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.treewalk.filter;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.util.io;version="[3.1.0,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"

org.eclipse.jgit.junit/pom.xml

@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.junit</artifactId>

org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit"
       label="%featureName"
-      version="3.1.0.qualifier"
+      version="3.1.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">

org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>

org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.java7"
       label="%featureName"
-      version="3.1.0.qualifier"
+      version="3.1.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">

org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>

org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.junit"
       label="%featureName"
-      version="3.1.0.qualifier"
+      version="3.1.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">

org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>

org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.pgm"
       label="%featureName"
-      version="3.1.0.qualifier"
+      version="3.1.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -27,7 +27,7 @@
          version="0.0.0"/>
 
    <requires>
-      <import feature="org.eclipse.jgit" version="3.1.0" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="3.1.1" match="equivalent"/>
    </requires>
 
    <plugin

org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>

org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.pgm.source"
       label="%featureName"
-      version="3.1.0.qualifier"
+      version="3.1.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">

org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>

org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.repository</artifactId>

org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.source"
       label="%featureName"
-      version="3.1.0.qualifier"
+      version="3.1.1.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">

org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>

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

org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml

@@ -49,7 +49,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.target</artifactId>

org.eclipse.jgit.packaging/pom.xml

@@ -53,7 +53,7 @@
 
   <groupId>org.eclipse.jgit</groupId>
   <artifactId>jgit.tycho.parent</artifactId>
-  <version>3.1.0-SNAPSHOT</version>
+  <version>3.1.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>JGit Tycho Parent</name>

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)",
+Import-Package: org.eclipse.jgit.api;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.dircache;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.dircache;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.java7;version="[3.1.0,3.2.0)";resolution:=optional,
+ org.eclipse.jgit.java7;version="[3.1.1,3.2.0)";resolution:=optional,
- org.eclipse.jgit.junit;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.junit;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.merge;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.merge;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.pgm;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.pgm;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.pgm.internal;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.pgm.internal;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.pgm.opt;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.pgm.opt;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.util.io;version="[3.1.0,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)"

org.eclipse.jgit.pgm.test/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.pgm.test</artifactId>

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;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.api.errors;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.api.errors;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.archive;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.archive;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.awtui;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.awtui;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.blame;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.blame;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.diff;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.diff;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.dircache;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.dircache;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.errors;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.0,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.0,3.2.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.merge;version="3.1.0",
+ org.eclipse.jgit.merge;version="3.1.1",
- org.eclipse.jgit.nls;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.nls;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.notes;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.notes;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.revplot;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.revplot;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.revwalk.filter;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.revwalk.filter;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.storage.pack;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.storage.pack;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.transport;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.transport;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.transport.resolver;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.transport.resolver;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.treewalk;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.treewalk;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.treewalk.filter;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.treewalk.filter;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.util.io;version="[3.1.0,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.debug;version="3.1.1",
- org.eclipse.jgit.pgm.internal;version="3.1.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test",
+ 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.0"
+ org.eclipse.jgit.pgm.opt;version="3.1.1"
 Main-Class: org.eclipse.jgit.pgm.Main
 Implementation-Title: JGit Command Line Interface

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
+Bundle-Version: 3.1.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.1.0";roots="."
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.1.1";roots="."

org.eclipse.jgit.pgm/pom.xml

@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.pgm</artifactId>
@@ -178,6 +178,20 @@
                   </manifestEntries>
                 </transformer>
               </transformers>
+              <filters>
+                <!-- exclude the signing data for individual jars, ueberjar will be signed again -->
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                    <exclude>OSGI-OPT/**</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+              <shadedArtifactAttached>true</shadedArtifactAttached>
+              <shadedClassifierName>shaded</shadedClassifierName> <!-- Any name that makes sense -->
             </configuration>
           </execution>
         </executions>

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;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.api.errors;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.api.errors;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.awtui;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.awtui;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.blame;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.blame;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.console;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.console;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.diff;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.diff;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.dircache;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.dircache;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.errors;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.errors;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.events;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.events;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.fnmatch;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.fnmatch;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.ignore;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.ignore;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.internal;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.internal;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[3.1.0,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.0,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.0,3.2.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.java7;version="[3.1.0,3.2.0)";resolution:=optional,
+ org.eclipse.jgit.java7;version="[3.1.1,3.2.0)";resolution:=optional,
- org.eclipse.jgit.junit;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.junit;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.merge;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.merge;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.nls;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.nls;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.notes;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.notes;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.patch;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.patch;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.pgm;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.pgm;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.pgm.internal;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.pgm.internal;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.revplot;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.revplot;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.revwalk.filter;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.revwalk.filter;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.storage.pack;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.storage.pack;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.submodule;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.submodule;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.transport;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.transport;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.treewalk;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.treewalk;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.treewalk.filter;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.treewalk.filter;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.util.io;version="[3.1.0,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)",

org.eclipse.jgit.test/pom.xml

@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.test</artifactId>

org.eclipse.jgit.test/tst/org/eclipse/jgit/revplot/PlotCommitListTest.java

@@ -156,8 +156,8 @@ public class PlotCommitListTest extends RevWalkTestCase {
 
 		CommitListAssert test = new CommitListAssert(pcl);
 		test.commit(c).lanePos(0).parents(a);
-		test.commit(b).lanePos(1).parents(a);
+		test.commit(b).lanePos(0).parents(a);
-		test.commit(a).lanePos(0).parents();
+		test.commit(a).lanePos(1).parents();
 		test.noMoreCommits();
 	}
 
@@ -179,9 +179,9 @@ public class PlotCommitListTest extends RevWalkTestCase {
 
 		CommitListAssert test = new CommitListAssert(pcl);
 		test.commit(d).lanePos(0).parents(a);
-		test.commit(c).lanePos(1).parents(a);
+		test.commit(c).lanePos(0).parents(a);
-		test.commit(b).lanePos(1).parents(a);
+		test.commit(b).lanePos(0).parents(a);
-		test.commit(a).lanePos(0).parents();
+		test.commit(a).lanePos(1).parents();
 		test.noMoreCommits();
 	}
 
@@ -214,14 +214,45 @@ public class PlotCommitListTest extends RevWalkTestCase {
 		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(e).lanePos(0).parents(a);
-		test.commit(d).lanePos(1).parents(a);
+		test.commit(d).lanePos(0).parents(a);
-		test.commit(c).lanePos(1).parents(a);
+		test.commit(c).lanePos(0).parents(a);
-		test.commit(b).lanePos(1).parents(a);
+		test.commit(b).lanePos(0).parents(a);
-		test.commit(a).lanePos(0).parents();
+		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<PlotLane> pcl = new PlotCommitList<PlotLane>();
+		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 {

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"
+Export-Package: org.eclipse.jgit.awtui;version="3.1.1"
-Import-Package: org.eclipse.jgit.errors;version="[3.1.0,3.2.0)",
+Import-Package: org.eclipse.jgit.errors;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.lib;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.nls;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.nls;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.revplot;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.revplot;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.transport;version="[3.1.0,3.2.0)",
+ org.eclipse.jgit.transport;version="[3.1.1,3.2.0)",
- org.eclipse.jgit.util;version="[3.1.0,3.2.0)"
+ org.eclipse.jgit.util;version="[3.1.1,3.2.0)"

org.eclipse.jgit.ui/pom.xml

@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ui</artifactId>

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",
+Export-Package: org.eclipse.jgit.api;version="3.1.1",
- org.eclipse.jgit.api.errors;version="3.1.0",
+ org.eclipse.jgit.api.errors;version="3.1.1",
- org.eclipse.jgit.blame;version="3.1.0",
+ org.eclipse.jgit.blame;version="3.1.1",
- org.eclipse.jgit.diff;version="3.1.0",
+ org.eclipse.jgit.diff;version="3.1.1",
- org.eclipse.jgit.dircache;version="3.1.0",
+ org.eclipse.jgit.dircache;version="3.1.1",
- org.eclipse.jgit.errors;version="3.1.0",
+ org.eclipse.jgit.errors;version="3.1.1",
- org.eclipse.jgit.events;version="3.1.0",
+ org.eclipse.jgit.events;version="3.1.1",
- org.eclipse.jgit.fnmatch;version="3.1.0",
+ org.eclipse.jgit.fnmatch;version="3.1.1",
- org.eclipse.jgit.ignore;version="3.1.0",
+ org.eclipse.jgit.ignore;version="3.1.1",
- org.eclipse.jgit.internal;version="3.1.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
+ 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.0";x-friends:="org.eclipse.jgit.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.0";
+ 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.lib;version="3.1.1",
- org.eclipse.jgit.merge;version="3.1.0",
+ org.eclipse.jgit.merge;version="3.1.1",
- org.eclipse.jgit.nls;version="3.1.0",
+ org.eclipse.jgit.nls;version="3.1.1",
- org.eclipse.jgit.notes;version="3.1.0",
+ org.eclipse.jgit.notes;version="3.1.1",
- org.eclipse.jgit.patch;version="3.1.0",
+ org.eclipse.jgit.patch;version="3.1.1",
- org.eclipse.jgit.revplot;version="3.1.0",
+ org.eclipse.jgit.revplot;version="3.1.1",
- org.eclipse.jgit.revwalk;version="3.1.0",
+ org.eclipse.jgit.revwalk;version="3.1.1",
- org.eclipse.jgit.revwalk.filter;version="3.1.0",
+ org.eclipse.jgit.revwalk.filter;version="3.1.1",
- org.eclipse.jgit.storage.file;version="3.1.0",
+ org.eclipse.jgit.storage.file;version="3.1.1",
- org.eclipse.jgit.storage.pack;version="3.1.0",
+ org.eclipse.jgit.storage.pack;version="3.1.1",
- org.eclipse.jgit.submodule;version="3.1.0",
+ org.eclipse.jgit.submodule;version="3.1.1",
- org.eclipse.jgit.transport;version="3.1.0",
+ org.eclipse.jgit.transport;version="3.1.1",
- org.eclipse.jgit.transport.resolver;version="3.1.0",
+ org.eclipse.jgit.transport.resolver;version="3.1.1",
- org.eclipse.jgit.treewalk;version="3.1.0",
+ org.eclipse.jgit.treewalk;version="3.1.1",
- org.eclipse.jgit.treewalk.filter;version="3.1.0",
+ org.eclipse.jgit.treewalk.filter;version="3.1.1",
- org.eclipse.jgit.util;version="3.1.0",
+ org.eclipse.jgit.util;version="3.1.1",
- org.eclipse.jgit.util.io;version="3.1.0"
+ 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)"

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
+Bundle-Version: 3.1.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit;version="3.1.0";roots="."
+Eclipse-SourceBundle: org.eclipse.jgit;version="3.1.1";roots="."

org.eclipse.jgit/pom.xml

@@ -53,7 +53,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit</artifactId>

org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java

@@ -669,8 +669,8 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
 		BufferedWriter fw = new BufferedWriter(new OutputStreamWriter(
 				new FileOutputStream(rebaseState.getFile(GIT_REBASE_TODO)),
 				Constants.CHARACTER_ENCODING));
-		fw.write("# Created by EGit: rebasing " + upstreamCommit.name()
+		fw.write("# Created by EGit: rebasing " + headId.name() + " onto "
-				+ " onto " + headId.name());
+				+ upstreamCommit.name());
 		fw.newLine();
 		try {
 			StringBuilder sb = new StringBuilder();

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 class BranchTrackingStatus {
 		if (tracking == null)
 			return null;
 
-		Ref local = repository.getRef(branchName);
+		Ref local = repository.getRef(fullBranchName);
 		if (local == null)
 			return null;
 

org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java

@@ -119,8 +119,12 @@ public class PlotCommitList<L extends PlotLane> extends
 		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.

pom.xml

@@ -51,7 +51,7 @@
   <groupId>org.eclipse.jgit</groupId>
   <artifactId>org.eclipse.jgit-parent</artifactId>
   <packaging>pom</packaging>
-  <version>3.1.0-SNAPSHOT</version>
+  <version>3.1.1-SNAPSHOT</version>
 
   <name>JGit - Parent</name>
   <url>${jgit-url}</url>