Merge "Prepare 5.12.1-SNAPSHOT builds" into stable-5.12

2 files changed, 42 insertions, 42 deletions

diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index 757fe63c68..b4a18585c8 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.pgm
 Bundle-SymbolicName: org.eclipse.jgit.pgm
-Bundle-Version: 5.12.0.202106070339-r
+Bundle-Version: 5.12.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -14,46 +14,46 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
  org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util;version="[9.4.5,10.0.0)",
  org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.api;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.archive;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.awtui;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.blame;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.diff;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.dircache;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.errors;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.gitrepo;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.internal.storage.io;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.lfs;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.lfs.server;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.lfs.server.fs;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.lfs.server.s3;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.lib;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.merge;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.nls;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.notes;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.revplot;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.storage.pack;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.transport;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.transport.sshd;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.util;version="[5.12.0,5.13.0)",
- org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)",
+ org.eclipse.jgit.api;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.archive;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.awtui;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.blame;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.diff;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.dircache;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.errors;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.gitrepo;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.internal.storage.io;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.lfs;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.lfs.server;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.lfs.server.s3;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.lib;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.merge;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.nls;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.notes;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.revplot;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.storage.pack;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.transport;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.transport.sshd;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.util;version="[5.12.1,5.13.0)",
+ org.eclipse.jgit.util.io;version="[5.12.1,5.13.0)",
  org.kohsuke.args4j;version="[2.33.0,3.0.0)",
  org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)"
-Export-Package: org.eclipse.jgit.console;version="5.12.0";
+Export-Package: org.eclipse.jgit.console;version="5.12.1";
  uses:="org.eclipse.jgit.transport,
   org.eclipse.jgit.util",
- org.eclipse.jgit.pgm;version="5.12.0";
+ org.eclipse.jgit.pgm;version="5.12.1";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.jgit.util.io,
    org.eclipse.jgit.awtui,
@@ -65,14 +65,14 @@ Export-Package: org.eclipse.jgit.console;version="5.12.0";
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.api,
    javax.swing",
- org.eclipse.jgit.pgm.debug;version="5.12.0";
+ org.eclipse.jgit.pgm.debug;version="5.12.1";
   uses:="org.eclipse.jgit.util.io,
    org.eclipse.jgit.pgm,
    org.eclipse.jetty.servlet",
- org.eclipse.jgit.pgm.internal;version="5.12.0";
+ org.eclipse.jgit.pgm.internal;version="5.12.1";
   x-friends:="org.eclipse.jgit.pgm.test,
    org.eclipse.jgit.test",
- org.eclipse.jgit.pgm.opt;version="5.12.0";
+ org.eclipse.jgit.pgm.opt;version="5.12.1";
   uses:="org.kohsuke.args4j,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
index b2c7cf2a6a..8f433d5633 100644
--- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.jgit.pgm - Sources
 Bundle-SymbolicName: org.eclipse.jgit.pgm.source
 Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.12.0.202106070339-r
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.12.0.202106070339-r";roots="."
+Bundle-Version: 5.12.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.12.1.qualifier";roots="."