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>

2 files changed, 34 insertions, 34 deletions

diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 4f6d874bf4..afb46a1e08 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 20968e8c76..10c561072b 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="."