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>

3 files changed, 47 insertions, 33 deletions

diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index a6cf0f892f..f04011e68a 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 905f5c4847..44666edbd4 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 ff80bebf0d..19d73c08c7 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/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>