Merge branch 'stable-5.8'
* stable-5.8:
Add new osgi fragments to maven-central deploy scripts
Do not require org.assertj.core.annotations
Change-Id: I338065e7d2bf95b59a13d09cff7aea0c7689fe42
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index e03dd55..b454e1b 100644
--- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@
Automatic-Module-Name: org.eclipse.jgit.ant.test
Bundle-SymbolicName: org.eclipse.jgit.ant.test
Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.ant.tasks;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.junit;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
+ org.eclipse.jgit.ant.tasks;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.junit;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml
index b00d2cd..d70f4be 100644
--- a/org.eclipse.jgit.ant.test/pom.xml
+++ b/org.eclipse.jgit.ant.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ant.test</artifactId>
diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
index cbe30d7..2e1f908 100644
--- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.ant
Bundle-SymbolicName: org.eclipse.jgit.ant
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.storage.file;version="[5.8.1,5.9.0)"
+ org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)"
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.ant;version="5.8.1",
- org.eclipse.jgit.ant.tasks;version="5.8.1";
+Export-Package: org.eclipse.jgit.ant;version="5.9.0",
+ org.eclipse.jgit.ant.tasks;version="5.9.0";
uses:="org.apache.tools.ant,
org.apache.tools.ant.types"
diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF
index 9eeea39..aadb6e0 100644
--- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.ant - Sources
Bundle-SymbolicName: org.eclipse.jgit.ant.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.8.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.8.1.qualifier";roots="."
+Bundle-Version: 5.9.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.9.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml
index 15d628b..5e94e1a 100644
--- a/org.eclipse.jgit.ant/pom.xml
+++ b/org.eclipse.jgit.ant/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ant</artifactId>
diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
index 31751a6..bf369bc 100644
--- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.archive
Bundle-SymbolicName: org.eclipse.jgit.archive
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -13,17 +13,17 @@
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="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.nls;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revwalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
+ org.eclipse.jgit.api;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.nls;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.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="5.8.1";
+Export-Package: org.eclipse.jgit.archive;version="5.9.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.api,
org.apache.commons.compress.archivers,
org.osgi.framework",
- org.eclipse.jgit.archive.internal;version="5.8.1";x-internal:=true
+ org.eclipse.jgit.archive.internal;version="5.9.0";x-internal:=true
diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
index 8b06fa7..eabb7c3 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-Name: org.eclipse.jgit.archive - Sources
Bundle-SymbolicName: org.eclipse.jgit.archive.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.8.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.8.1.qualifier";roots="."
+Bundle-Version: 5.9.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.9.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml
index acbf4ef..da951da 100644
--- a/org.eclipse.jgit.archive/pom.xml
+++ b/org.eclipse.jgit.archive/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.archive</artifactId>
diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml
index 3aaf101..5778056 100644
--- a/org.eclipse.jgit.benchmarks/pom.xml
+++ b/org.eclipse.jgit.benchmarks/pom.xml
@@ -14,7 +14,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jgit</groupId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
<artifactId>org.eclipse.jgit.benchmarks</artifactId>
<packaging>jar</packaging>
diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml
index 19e6462..fa413a3 100644
--- a/org.eclipse.jgit.coverage/pom.xml
+++ b/org.eclipse.jgit.coverage/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,88 +27,88 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ant</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.archive</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.apache</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.server</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.server</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ui</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.test</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ant.test</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.test</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm.test</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.test</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.server.test</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
index 4c2376f..aa3d90f 100644
--- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test
Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.gpg.bc.internal;version="[5.8.1,5.9.0)",
+Import-Package: org.eclipse.jgit.gpg.bc.internal;version="[5.9.0,5.10.0)",
org.junit;version="[4.13,5.0.0)"
Export-Package: org.eclipse.jgit.gpg.bc.internal;x-internal:=true
Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml
index 6918c72..495755d 100644
--- a/org.eclipse.jgit.gpg.bc.test/pom.xml
+++ b/org.eclipse.jgit.gpg.bc.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.gpg.bc.test</artifactId>
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
index 45ad204..82ce42a 100644
--- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
@@ -3,10 +3,10 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.gpg.bc
Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true
-Fragment-Host: org.eclipse.jgit;bundle-version="[5.8.1,5.9.0)"
+Fragment-Host: org.eclipse.jgit;bundle-version="[5.9.0,5.10.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.bouncycastle.bcpg;version="[1.65.0,2.0.0)",
org.bouncycastle.gpg;version="[1.65.0,2.0.0)",
@@ -17,13 +17,13 @@
org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)",
org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)",
org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)",
- org.eclipse.jgit.annotations;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.api.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.nls;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
+ org.eclipse.jgit.annotations;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.nls;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.gpg.bc.internal;version="5.8.1";
+Export-Package: org.eclipse.jgit.gpg.bc.internal;version="5.9.0";
x-friends:="org.eclipse.jgit.gpg.bc.test"
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF
index ca5a915..a250123 100644
--- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.gpg.bc - Sources
Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.8.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.8.1.qualifier";roots="."
+Bundle-Version: 5.9.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.9.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml
index 62d9ae7..91d6c24 100644
--- a/org.eclipse.jgit.gpg.bc/pom.xml
+++ b/org.eclipse.jgit.gpg.bc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.gpg.bc</artifactId>
diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
index 0b38bc1..3910fab 100644
--- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.http.apache
Bundle-SymbolicName: org.eclipse.jgit.http.apache
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
@@ -25,11 +25,11 @@
org.apache.http.impl.conn;version="[4.3.0,5.0.0)",
org.apache.http.params;version="[4.3.0,5.0.0)",
org.apache.http.ssl;version="[4.3.0,5.0.0)",
- org.eclipse.jgit.annotations;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.nls;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport.http;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)"
-Export-Package: org.eclipse.jgit.transport.http.apache;version="5.8.1";
+ org.eclipse.jgit.annotations;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.nls;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport.http;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)"
+Export-Package: org.eclipse.jgit.transport.http.apache;version="5.9.0";
uses:="org.apache.http.client,
org.eclipse.jgit.transport.http,
org.apache.http.entity,
diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF
index 4afc6ea..a26e7eb 100644
--- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.http.apache - Sources
Bundle-SymbolicName: org.eclipse.jgit.http.apache.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.8.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.8.1.qualifier";roots="."
+Bundle-Version: 5.9.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.9.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml
index a8e859e..170b676 100644
--- a/org.eclipse.jgit.http.apache/pom.xml
+++ b/org.eclipse.jgit.http.apache/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.apache</artifactId>
diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index 4aa9fe8f..9a922d0 100644
--- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.http.server
Bundle-SymbolicName: org.eclipse.jgit.http.server
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.http.server;version="5.8.1",
- org.eclipse.jgit.http.server.glue;version="5.8.1";
+Export-Package: org.eclipse.jgit.http.server;version="5.9.0",
+ org.eclipse.jgit.http.server.glue;version="5.9.0";
uses:="javax.servlet,javax.servlet.http",
- org.eclipse.jgit.http.server.resolver;version="5.8.1";
+ org.eclipse.jgit.http.server.resolver;version="5.9.0";
uses:="org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.lib,
org.eclipse.jgit.transport,
@@ -18,14 +18,14 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
javax.servlet.http;version="[2.5.0,3.2.0)",
- org.eclipse.jgit.annotations;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.transport.parser;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.nls;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revwalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport.resolver;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)"
+ org.eclipse.jgit.annotations;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.nls;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)"
diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF
index aaa0cff..db03710 100644
--- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.http.server - Sources
Bundle-SymbolicName: org.eclipse.jgit.http.server.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.8.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.8.1.qualifier";roots="."
+Bundle-Version: 5.9.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.9.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index c82b972..18a8834 100644
--- a/org.eclipse.jgit.http.server/pom.xml
+++ b/org.eclipse.jgit.http.server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.server</artifactId>
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 5048ab3..a4d096b 100644
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.http.test
Bundle-SymbolicName: org.eclipse.jgit.http.test
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -28,25 +28,25 @@
org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.http.server;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.http.server.glue;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.http.server.resolver;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.junit;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.junit.http;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.nls;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revwalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport.http;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport.resolver;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
+ org.eclipse.jgit.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.http.server;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.http.server.glue;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.http.server.resolver;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.junit;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.junit.http;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.nls;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport.http;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
org.hamcrest;version="[1.1.0,2.0.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml
index 3d1e95a..c643166 100644
--- a/org.eclipse.jgit.http.test/pom.xml
+++ b/org.eclipse.jgit.http.test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.test</artifactId>
diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index de9d4e3..3a8145f 100644
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.junit.http
Bundle-SymbolicName: org.eclipse.jgit.junit.http
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
@@ -22,16 +22,16 @@
org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.ssl;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.http.server;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.junit;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revwalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport.resolver;version="[5.8.1,5.9.0)",
+ org.eclipse.jgit.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.http.server;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.junit;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.9.0,5.10.0)",
org.junit;version="[4.13,5.0.0)"
-Export-Package: org.eclipse.jgit.junit.http;version="5.8.1";
+Export-Package: org.eclipse.jgit.junit.http;version="5.9.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.junit,
javax.servlet.http,
diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF
index 3978a02..38a8c57 100644
--- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.junit.http - Sources
Bundle-SymbolicName: org.eclipse.jgit.junit.http.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.8.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.8.1.qualifier";roots="."
+Bundle-Version: 5.9.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.9.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml
index 74aaec8..220952a 100644
--- a/org.eclipse.jgit.junit.http/pom.xml
+++ b/org.eclipse.jgit.junit.http/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit.http</artifactId>
diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
index 6885552..77f65e4 100644
--- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.junit.ssh
Bundle-SymbolicName: org.eclipse.jgit.junit.ssh
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
@@ -31,16 +31,16 @@
org.apache.sshd.server.shell;version="[2.4.0,2.5.0)",
org.apache.sshd.server.subsystem;version="[2.4.0,2.5.0)",
org.apache.sshd.server.subsystem.sftp;version="[2.4.0,2.5.0)",
- org.eclipse.jgit.annotations;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.api;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.api.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.junit;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revwalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
+ org.eclipse.jgit.annotations;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.api;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.junit;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.experimental.theories;version="[4.13,5.0.0)",
org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit.ssh;version="5.8.1"
+Export-Package: org.eclipse.jgit.junit.ssh;version="5.9.0"
diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF
index 2affb08..ccb341e 100644
--- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.junit.ssh - Sources
Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.8.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.8.1.qualifier";roots="."
+Bundle-Version: 5.9.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.9.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml
index b657a0a..c4dae96 100644
--- a/org.eclipse.jgit.junit.ssh/pom.xml
+++ b/org.eclipse.jgit.junit.ssh/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit.ssh</artifactId>
diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
index eb19b53..41543a0 100644
--- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
@@ -3,35 +3,35 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.junit
Bundle-SymbolicName: org.eclipse.jgit.junit
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.annotations;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.api;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.api.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.dircache;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.merge;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revwalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="5.8.1",
- org.eclipse.jgit.treewalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util.io;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util.time;version="[5.8.1,5.9.0)",
+Import-Package: org.eclipse.jgit.annotations;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.api;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.dircache;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.merge;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="5.9.0",
+ org.eclipse.jgit.treewalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util.io;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util.time;version="[5.9.0,5.10.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.rules;version="[4.13,5.0.0)",
org.junit.runner;version="[4.13,5.0.0)",
org.junit.runners;version="[4.13,5.0.0)",
org.junit.runners.model;version="[4.13,5.0.0)",
org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit;version="5.8.1";
+Export-Package: org.eclipse.jgit.junit;version="5.9.0";
uses:="org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
@@ -44,4 +44,4 @@
org.junit.runners.model,
org.junit.runner,
org.eclipse.jgit.util.time",
- org.eclipse.jgit.junit.time;version="5.8.1";uses:="org.eclipse.jgit.util.time"
+ org.eclipse.jgit.junit.time;version="5.9.0";uses:="org.eclipse.jgit.util.time"
diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF
index 27ddb50..3363e71 100644
--- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.junit - Sources
Bundle-SymbolicName: org.eclipse.jgit.junit.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.8.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.8.1.qualifier";roots="."
+Bundle-Version: 5.9.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.9.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml
index 18a9f69..82fe656 100644
--- a/org.eclipse.jgit.junit/pom.xml
+++ b/org.eclipse.jgit.junit/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit</artifactId>
diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
index 06f22f3..5e41446 100644
--- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.lfs.server.test
Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -28,24 +28,24 @@
org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.api;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.api.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.junit;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.junit.http;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs.server;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs.server.fs;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs.test;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revwalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.treewalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
+ org.eclipse.jgit.api;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.junit;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.junit.http;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs.server;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs.test;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.treewalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.rules;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml
index 9ecb9a8..f8fb301 100644
--- a/org.eclipse.jgit.lfs.server.test/pom.xml
+++ b/org.eclipse.jgit.lfs.server.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.server.test</artifactId>
diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
index a4b79f3..979352c 100644
--- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
@@ -3,19 +3,19 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.lfs.server
Bundle-SymbolicName: org.eclipse.jgit.lfs.server
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs.server;version="5.8.1";
+Export-Package: org.eclipse.jgit.lfs.server;version="5.9.0";
uses:="javax.servlet.http,
org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.fs;version="5.8.1";
+ org.eclipse.jgit.lfs.server.fs;version="5.9.0";
uses:="javax.servlet,
javax.servlet.http,
org.eclipse.jgit.lfs.server,
org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.internal;version="5.8.1";x-internal:=true,
- org.eclipse.jgit.lfs.server.s3;version="5.8.1";
+ org.eclipse.jgit.lfs.server.internal;version="5.9.0";x-internal:=true,
+ org.eclipse.jgit.lfs.server.s3;version="5.9.0";
uses:="org.eclipse.jgit.lfs.server,
org.eclipse.jgit.lfs.lib"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -25,15 +25,15 @@
javax.servlet.http;version="[3.1.0,4.0.0)",
org.apache.http;version="[4.3.0,5.0.0)",
org.apache.http.client;version="[4.3.0,5.0.0)",
- org.eclipse.jgit.annotations;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs.internal;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.nls;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport.http;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
+ org.eclipse.jgit.annotations;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs.internal;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.nls;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport.http;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
org.slf4j;version="[1.7.0,2.0.0)"
diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF
index 8f99551..453f128 100644
--- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.lfs.server - Sources
Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.8.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.8.1.qualifier";roots="."
+Bundle-Version: 5.9.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.9.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml
index 5922995..6f9fd20 100644
--- a/org.eclipse.jgit.lfs.server/pom.xml
+++ b/org.eclipse.jgit.lfs.server/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.server</artifactId>
diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
index c2959a2..44c5350 100644
--- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
@@ -3,22 +3,22 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.lfs.test
Bundle-SymbolicName: org.eclipse.jgit.lfs.test
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.junit;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revwalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.treewalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
+Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.junit;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.treewalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.runner;version="[4.13,5.0.0)",
org.junit.runners;version="[4.13,5.0.0)"
-Export-Package: org.eclipse.jgit.lfs.test;version="5.8.1";x-friends:="org.eclipse.jgit.lfs.server.test"
+Export-Package: org.eclipse.jgit.lfs.test;version="5.9.0";x-friends:="org.eclipse.jgit.lfs.server.test"
diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml
index 9a22efd..6e4decd 100644
--- a/org.eclipse.jgit.lfs.test/pom.xml
+++ b/org.eclipse.jgit.lfs.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.test</artifactId>
diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
index 53f0d16..ced8ad4 100644
--- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
@@ -3,33 +3,33 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.lfs
Bundle-SymbolicName: org.eclipse.jgit.lfs
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs;version="5.8.1",
- org.eclipse.jgit.lfs.errors;version="5.8.1",
- org.eclipse.jgit.lfs.internal;version="5.8.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server",
- org.eclipse.jgit.lfs.lib;version="5.8.1"
+Export-Package: org.eclipse.jgit.lfs;version="5.9.0",
+ org.eclipse.jgit.lfs.errors;version="5.9.0",
+ org.eclipse.jgit.lfs.internal;version="5.9.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server",
+ org.eclipse.jgit.lfs.lib;version="5.9.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.google.gson;version="[2.8.2,3.0.0)",
com.google.gson.stream;version="[2.8.2,3.0.0)",
org.apache.http.impl.client;version="[4.2.6,5.0.0)",
org.apache.http.impl.conn;version="[4.2.6,5.0.0)",
- org.eclipse.jgit.annotations;version="[5.8.1,5.9.0)";resolution:=optional,
- org.eclipse.jgit.api.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.attributes;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.diff;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.hooks;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.nls;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revwalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.storage.pack;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport.http;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.treewalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util.io;version="[5.8.1,5.9.0)"
+ org.eclipse.jgit.annotations;version="[5.9.0,5.10.0)";resolution:=optional,
+ org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.attributes;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.diff;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.hooks;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.nls;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.storage.pack;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport.http;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.treewalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util.io;version="[5.9.0,5.10.0)"
diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
index 0705a4b..ac6a4a4 100644
--- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.lfs - Sources
Bundle-SymbolicName: org.eclipse.jgit.lfs.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.8.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.8.1.qualifier";roots="."
+Bundle-Version: 5.9.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.9.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml
index 981d6b3..0922a69 100644
--- a/org.eclipse.jgit.lfs/pom.xml
+++ b/org.eclipse.jgit.lfs/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs</artifactId>
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 9654627..823c872 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 @@
<feature
id="org.eclipse.jgit"
label="%featureName"
- version="5.8.1.qualifier"
+ version="5.9.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
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 6270a43..aac5072 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
index f3c64ee..73e139a 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.gpg.bc"
label="%featureName"
- version="5.8.1.qualifier"
+ version="5.9.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import plugin="org.eclipse.jgit" version="5.8.1" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="5.9.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml
index 20a53a2..b7dc720 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
index 8ad79a7..d912aa8 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.http.apache"
label="%featureName"
- version="5.8.1.qualifier"
+ version="5.9.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import plugin="org.eclipse.jgit" version="5.8.1" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="5.9.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
index 15d90e2..f0665a6 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
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 bb46e57..78077e8 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 @@
<feature
id="org.eclipse.jgit.junit"
label="%featureName"
- version="5.8.1.qualifier"
+ version="5.9.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -24,7 +24,7 @@
<requires>
<import plugin="com.jcraft.jsch"/>
- <import plugin="org.eclipse.jgit" version="5.8.1" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="5.9.0" match="equivalent"/>
</requires>
<plugin
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 00ee701..1368626 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
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
index 09e58ec..474e8ff 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.lfs"
label="%featureName"
- version="5.8.1.qualifier"
+ version="5.9.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import feature="org.eclipse.jgit" version="5.8.1" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.9.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
index 02f31a0..756b068 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
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 81e9f1c..bbf1977 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 @@
<feature
id="org.eclipse.jgit.pgm"
label="%featureName"
- version="5.8.1.qualifier"
+ version="5.9.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -35,9 +35,9 @@
version="0.0.0"/>
<requires>
- <import feature="org.eclipse.jgit" version="5.8.1" match="equivalent"/>
- <import feature="org.eclipse.jgit.lfs" version="5.8.1" match="equivalent"/>
- <import feature="org.eclipse.jgit.ssh.apache" version="5.8.1" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.9.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit.lfs" version="5.9.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit.ssh.apache" version="5.9.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
index 319c285..55c6fdb 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
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 cabc07d..1e34ba2 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.repository</artifactId>
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 a79e9d8..a326fb7 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 @@
<feature
id="org.eclipse.jgit.source"
label="%featureName"
- version="5.8.1.qualifier"
+ version="5.9.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import feature="org.eclipse.jgit" version="5.8.1" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.9.0" match="equivalent"/>
</requires>
<plugin
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 286f649..4ccf310 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
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.eclipse.jgit.feature</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
index fe60b1c..39b3c79 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.ssh.apache"
label="%featureName"
- version="5.8.1.qualifier"
+ version="5.9.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import feature="org.eclipse.jgit" version="5.8.1" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.9.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml
index b0dead2..8932185 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
index 1c25a99..1ebe151 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.ssh.jsch"
label="%featureName"
- version="5.8.1.qualifier"
+ version="5.9.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import plugin="org.eclipse.jgit" version="5.8.1" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="5.9.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml
index 125c074..2a98697 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
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 daa5865..098f767 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: JGit Target Platform Bundle
Bundle-SymbolicName: org.eclipse.jgit.target
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.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 c8b000f..abff8ba 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.target</artifactId>
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index 03a4c1e..52d7b49 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -16,7 +16,7 @@
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JGit Tycho Parent</name>
diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
index b6b3e07..34f1e0f 100644
--- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
@@ -3,28 +3,28 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.pgm.test
Bundle-SymbolicName: org.eclipse.jgit.pgm.test
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.api;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.api.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.diff;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.dircache;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.file;version="5.8.1",
- org.eclipse.jgit.junit;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.merge;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.pgm;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.pgm.internal;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.pgm.opt;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revwalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.treewalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util.io;version="[5.8.1,5.9.0)",
+Import-Package: org.eclipse.jgit.api;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.diff;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.dircache;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.file;version="5.9.0",
+ org.eclipse.jgit.junit;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.merge;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.pgm;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.pgm.internal;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.pgm.opt;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.treewalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util.io;version="[5.9.0,5.10.0)",
org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.rules;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml
index b18875c..725ad1b 100644
--- a/org.eclipse.jgit.pgm.test/pom.xml
+++ b/org.eclipse.jgit.pgm.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.pgm.test</artifactId>
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index 2f50659..a564aac 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.pgm
Bundle-SymbolicName: org.eclipse.jgit.pgm
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -13,48 +13,48 @@
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.8.1,5.9.0)",
- org.eclipse.jgit.api.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.archive;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.awtui;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.blame;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.diff;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.dircache;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.gitrepo;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.ketch;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.io;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.reftree;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs.server;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs.server.fs;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs.server.s3;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.merge;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.nls;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.notes;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revplot;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revwalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.storage.pack;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport.resolver;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport.sshd;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.treewalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util.io;version="[5.8.1,5.9.0)",
+ org.eclipse.jgit.api;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.archive;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.awtui;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.blame;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.diff;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.dircache;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.gitrepo;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.ketch;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.io;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.reftree;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs.server;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs.server.s3;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.merge;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.nls;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.notes;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revplot;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.storage.pack;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport.sshd;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.treewalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util.io;version="[5.9.0,5.10.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.8.1";
+Export-Package: org.eclipse.jgit.console;version="5.9.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util",
- org.eclipse.jgit.pgm;version="5.8.1";
+ org.eclipse.jgit.pgm;version="5.9.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util.io,
org.eclipse.jgit.awtui,
@@ -66,14 +66,14 @@
org.eclipse.jgit.treewalk,
org.eclipse.jgit.api,
javax.swing",
- org.eclipse.jgit.pgm.debug;version="5.8.1";
+ org.eclipse.jgit.pgm.debug;version="5.9.0";
uses:="org.eclipse.jgit.util.io,
org.eclipse.jgit.pgm,
org.eclipse.jetty.servlet",
- org.eclipse.jgit.pgm.internal;version="5.8.1";
+ org.eclipse.jgit.pgm.internal;version="5.9.0";
x-friends:="org.eclipse.jgit.pgm.test,
org.eclipse.jgit.test",
- org.eclipse.jgit.pgm.opt;version="5.8.1";
+ org.eclipse.jgit.pgm.opt;version="5.9.0";
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 8dd45b5..19cd15e 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-Name: org.eclipse.jgit.pgm - Sources
Bundle-SymbolicName: org.eclipse.jgit.pgm.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.8.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.8.1.qualifier";roots="."
+Bundle-Version: 5.9.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.9.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index 38795b6..5338cb8 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.pgm</artifactId>
diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
index f7cfc7e..3bcd02f 100644
--- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test
Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -15,14 +15,14 @@
org.apache.sshd.common.session;version="[2.4.0,2.5.0)",
org.apache.sshd.common.util.net;version="[2.4.0,2.5.0)",
org.apache.sshd.common.util.security;version="[2.4.0,2.5.0)",
- org.eclipse.jgit.api.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.junit;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.junit.ssh;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport.sshd;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
+ org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.junit;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.junit.ssh;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport.sshd;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.experimental.theories;version="[4.13,5.0.0)",
org.junit.runner;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml
index cd311a0..ca7424d 100644
--- a/org.eclipse.jgit.ssh.apache.test/pom.xml
+++ b/org.eclipse.jgit.ssh.apache.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index 9836da4..26d318d 100644
--- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.8.1";x-internal:=true;
+Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.9.0";x-internal:=true;
uses:="org.apache.sshd.client,
org.apache.sshd.client.auth,
org.apache.sshd.client.auth.keyboard,
@@ -23,9 +23,9 @@
org.apache.sshd.common.signature,
org.apache.sshd.common.util.buffer,
org.eclipse.jgit.transport",
- org.eclipse.jgit.internal.transport.sshd.auth;version="5.8.1";x-internal:=true,
- org.eclipse.jgit.internal.transport.sshd.proxy;version="5.8.1";x-friends:="org.eclipse.jgit.ssh.apache.test",
- org.eclipse.jgit.transport.sshd;version="5.8.1";
+ org.eclipse.jgit.internal.transport.sshd.auth;version="5.9.0";x-internal:=true,
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="5.9.0";x-friends:="org.eclipse.jgit.ssh.apache.test",
+ org.eclipse.jgit.transport.sshd;version="5.9.0";
uses:="org.eclipse.jgit.transport,
org.apache.sshd.client.config.hosts,
org.apache.sshd.common.keyprovider,
@@ -75,12 +75,12 @@
org.apache.sshd.common.util.net;version="[2.4.0,2.5.0)",
org.apache.sshd.common.util.security;version="[2.4.0,2.5.0)",
org.apache.sshd.server.auth;version="[2.4.0,2.5.0)",
- org.eclipse.jgit.annotations;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.fnmatch;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.nls;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
+ org.eclipse.jgit.annotations;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.fnmatch;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.nls;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
org.slf4j;version="[1.7.0,2.0.0)"
diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF
index 9bea3e6..53b5336 100644
--- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.ssh.apache - Sources
Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.8.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.8.1.qualifier";roots="."
+Bundle-Version: 5.9.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.9.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml
index 1eae6b1..6b5b7f8 100644
--- a/org.eclipse.jgit.ssh.apache/pom.xml
+++ b/org.eclipse.jgit.ssh.apache/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
index 40e18ff..3e902e4 100644
--- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
@@ -3,21 +3,21 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test
Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)",
- org.eclipse.jgit.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.junit;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.junit.ssh;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
+ org.eclipse.jgit.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.junit;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.junit.ssh;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.experimental.theories;version="[4.13,5.0.0)",
org.junit.runner;version="[4.13,5.0.0)"
-Export-Package: org.eclipse.jgit.transport;version="5.8.1";
+Export-Package: org.eclipse.jgit.transport;version="5.9.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.junit,
org.eclipse.jgit.junit.ssh"
diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml
index 5b95f29..10acfd2 100644
--- a/org.eclipse.jgit.ssh.jsch.test/pom.xml
+++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.jsch.test</artifactId>
diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
index 0a8af40..c72b339 100644
--- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
@@ -3,24 +3,24 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.ssh.jsch
Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true
-Fragment-Host: org.eclipse.jgit;bundle-version="[5.8.1,5.9.0)"
+Fragment-Host: org.eclipse.jgit;bundle-version="[5.9.0,5.10.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.8.1";x-friends:="org.eclipse.egit.core",
- org.eclipse.jgit.transport;version="5.8.1";
+Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.9.0";x-friends:="org.eclipse.egit.core",
+ org.eclipse.jgit.transport;version="5.9.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.internal.transport.ssh,
org.eclipse.jgit.util,
com.jcraft.jsch"
Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)",
- org.eclipse.jgit.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.nls;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util.io;version="[5.8.1,5.9.0)",
+ org.eclipse.jgit.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.nls;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util.io;version="[5.9.0,5.10.0)",
org.slf4j;version="[1.7.0,2.0.0)"
diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF
index 754676c..7048f27 100644
--- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources
Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.8.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.8.1.qualifier";roots="."
+Bundle-Version: 5.9.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.9.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml
index 49acc1b..93f3544 100644
--- a/org.eclipse.jgit.ssh.jsch/pom.xml
+++ b/org.eclipse.jgit.ssh.jsch/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index ee63b4e..06f3c4d 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.test
Bundle-SymbolicName: org.eclipse.jgit.test
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -16,58 +16,58 @@
org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)",
org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)",
org.assertj.core.api;version="[3.14.0,4.0.0)",
- org.eclipse.jgit.annotations;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.api;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.api.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.archive;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.attributes;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.awtui;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.blame;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.diff;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.dircache;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.events;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.fnmatch;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.gitrepo;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.hooks;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.ignore;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.ignore.internal;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.fsck;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.io;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.storage.reftree;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.transport.connectivity;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.transport.http;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.internal.transport.parser;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.junit;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.junit.time;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lfs;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib.internal;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.merge;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.nls;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.notes;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.patch;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.pgm;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.pgm.internal;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revplot;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revwalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.storage.file;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.storage.pack;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.submodule;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport.http;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport.resolver;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.treewalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util.io;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util.sha1;version="[5.8.1,5.9.0)",
+ org.eclipse.jgit.annotations;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.api;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.archive;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.attributes;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.awtui;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.blame;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.diff;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.dircache;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.events;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.fnmatch;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.gitrepo;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.hooks;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.ignore;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.ignore.internal;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.fsck;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.io;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.storage.reftree;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.transport.connectivity;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.transport.http;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.junit;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.junit.time;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lfs;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib.internal;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.merge;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.nls;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.notes;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.patch;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.pgm;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.pgm.internal;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revplot;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.storage.pack;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.submodule;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport.http;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.treewalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util.io;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util.sha1;version="[5.9.0,5.10.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.experimental.theories;version="[4.13,5.0.0)",
org.junit.function;version="[4.13.0,5.0.0)",
diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml
index e6ae8ab..e94547c 100644
--- a/org.eclipse.jgit.test/pom.xml
+++ b/org.eclipse.jgit.test/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.test</artifactId>
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/MergedReftableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/MergedReftableTest.java
index a246ac9..0a03fc3 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/MergedReftableTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/MergedReftableTest.java
@@ -329,22 +329,22 @@
public void overlappedUpdateIndices() throws IOException {
ByteArrayOutputStream buf = new ByteArrayOutputStream();
ReftableWriter writer = new ReftableWriter(buf)
- .setMinUpdateIndex(1)
- .setMaxUpdateIndex(3)
- .begin();
- writer.writeRef(ref("refs/heads/a", 1), 1);
- writer.writeRef(ref("refs/heads/b", 2), 3);
- writer.finish();
- byte[] base = buf.toByteArray();
-
- buf = new ByteArrayOutputStream();
- writer = new ReftableWriter(buf)
.setMinUpdateIndex(2)
.setMaxUpdateIndex(4)
.begin();
writer.writeRef(ref("refs/heads/a", 10), 2);
writer.writeRef(ref("refs/heads/b", 20), 4);
writer.finish();
+ byte[] base = buf.toByteArray();
+
+ buf = new ByteArrayOutputStream();
+ writer = new ReftableWriter(buf)
+ .setMinUpdateIndex(1)
+ .setMaxUpdateIndex(3)
+ .begin();
+ writer.writeRef(ref("refs/heads/a", 1), 1);
+ writer.writeRef(ref("refs/heads/b", 2), 3);
+ writer.finish();
byte[] delta = buf.toByteArray();
MergedReftable mr = merge(base, delta);
@@ -368,22 +368,22 @@
public void enclosedUpdateIndices() throws IOException {
ByteArrayOutputStream buf = new ByteArrayOutputStream();
ReftableWriter writer = new ReftableWriter(buf)
- .setMinUpdateIndex(1)
- .setMaxUpdateIndex(4)
- .begin();
- writer.writeRef(ref("refs/heads/a", 1), 1);
- writer.writeRef(ref("refs/heads/b", 20), 4);
- writer.finish();
- byte[] base = buf.toByteArray();
-
- buf = new ByteArrayOutputStream();
- writer = new ReftableWriter(buf)
.setMinUpdateIndex(2)
.setMaxUpdateIndex(3)
.begin();
writer.writeRef(ref("refs/heads/a", 10), 2);
writer.writeRef(ref("refs/heads/b", 2), 3);
writer.finish();
+ byte[] base = buf.toByteArray();
+
+ buf = new ByteArrayOutputStream();
+ writer = new ReftableWriter(buf)
+ .setMinUpdateIndex(1)
+ .setMaxUpdateIndex(4)
+ .begin();
+ writer.writeRef(ref("refs/heads/a", 1), 1);
+ writer.writeRef(ref("refs/heads/b", 20), 4);
+ writer.finish();
byte[] delta = buf.toByteArray();
MergedReftable mr = merge(base, delta);
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java
index 36805d3..798aebe 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java
@@ -109,33 +109,33 @@
@Test
public void testTrivialTwoWay_validSubtreeSort() throws Exception {
- final DirCache treeB = db.readDirCache();
- final DirCache treeO = db.readDirCache();
- final DirCache treeT = db.readDirCache();
- {
- final DirCacheBuilder b = treeB.builder();
- final DirCacheBuilder o = treeO.builder();
- final DirCacheBuilder t = treeT.builder();
+ DirCache treeB = db.readDirCache();
+ DirCache treeO = db.readDirCache();
+ DirCache treeT = db.readDirCache();
- b.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
- b.add(createEntry("libelf/c", FileMode.REGULAR_FILE));
+ DirCacheBuilder bTreeBuilder = treeB.builder();
+ DirCacheBuilder oTreeBuilder = treeO.builder();
+ DirCacheBuilder tTreeBuilder = treeT.builder();
- o.add(createEntry("Makefile", FileMode.REGULAR_FILE));
- o.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
- o.add(createEntry("libelf/c", FileMode.REGULAR_FILE));
+ bTreeBuilder.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
+ bTreeBuilder.add(createEntry("libelf/c", FileMode.REGULAR_FILE));
- t.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
- t.add(createEntry("libelf/c", FileMode.REGULAR_FILE, "blah"));
+ oTreeBuilder.add(createEntry("Makefile", FileMode.REGULAR_FILE));
+ oTreeBuilder.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
+ oTreeBuilder.add(createEntry("libelf/c", FileMode.REGULAR_FILE));
- b.finish();
- o.finish();
- t.finish();
- }
+ tTreeBuilder.add(createEntry("libelf-po/a", FileMode.REGULAR_FILE));
+ tTreeBuilder
+ .add(createEntry("libelf/c", FileMode.REGULAR_FILE, "blah"));
- final ObjectInserter ow = db.newObjectInserter();
- final ObjectId b = commit(ow, treeB, new ObjectId[] {});
- final ObjectId o = commit(ow, treeO, new ObjectId[] { b });
- final ObjectId t = commit(ow, treeT, new ObjectId[] { b });
+ bTreeBuilder.finish();
+ oTreeBuilder.finish();
+ tTreeBuilder.finish();
+
+ ObjectInserter ow = db.newObjectInserter();
+ ObjectId b = commit(ow, treeB, new ObjectId[] {});
+ ObjectId o = commit(ow, treeO, new ObjectId[] { b });
+ ObjectId t = commit(ow, treeT, new ObjectId[] { b });
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
@@ -163,32 +163,31 @@
@Test
public void testTrivialTwoWay_concurrentSubtreeChange() throws Exception {
- final DirCache treeB = db.readDirCache();
- final DirCache treeO = db.readDirCache();
- final DirCache treeT = db.readDirCache();
- {
- final DirCacheBuilder b = treeB.builder();
- final DirCacheBuilder o = treeO.builder();
- final DirCacheBuilder t = treeT.builder();
+ DirCache treeB = db.readDirCache();
+ DirCache treeO = db.readDirCache();
+ DirCache treeT = db.readDirCache();
- b.add(createEntry("d/o", FileMode.REGULAR_FILE));
- b.add(createEntry("d/t", FileMode.REGULAR_FILE));
+ DirCacheBuilder bTreeBuilder = treeB.builder();
+ DirCacheBuilder oTreeBuilder = treeO.builder();
+ DirCacheBuilder tTreeBuilder = treeT.builder();
- o.add(createEntry("d/o", FileMode.REGULAR_FILE, "o !"));
- o.add(createEntry("d/t", FileMode.REGULAR_FILE));
+ bTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
+ bTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE));
- t.add(createEntry("d/o", FileMode.REGULAR_FILE));
- t.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));
+ oTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE, "o !"));
+ oTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE));
- b.finish();
- o.finish();
- t.finish();
- }
+ tTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
+ tTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));
- final ObjectInserter ow = db.newObjectInserter();
- final ObjectId b = commit(ow, treeB, new ObjectId[] {});
- final ObjectId o = commit(ow, treeO, new ObjectId[] { b });
- final ObjectId t = commit(ow, treeT, new ObjectId[] { b });
+ bTreeBuilder.finish();
+ oTreeBuilder.finish();
+ tTreeBuilder.finish();
+
+ ObjectInserter ow = db.newObjectInserter();
+ ObjectId b = commit(ow, treeB, new ObjectId[] {});
+ ObjectId o = commit(ow, treeO, new ObjectId[] { b });
+ ObjectId t = commit(ow, treeT, new ObjectId[] { b });
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
@@ -212,32 +211,31 @@
@Test
public void testTrivialTwoWay_conflictSubtreeChange() throws Exception {
- final DirCache treeB = db.readDirCache();
- final DirCache treeO = db.readDirCache();
- final DirCache treeT = db.readDirCache();
- {
- final DirCacheBuilder b = treeB.builder();
- final DirCacheBuilder o = treeO.builder();
- final DirCacheBuilder t = treeT.builder();
+ DirCache treeB = db.readDirCache();
+ DirCache treeO = db.readDirCache();
+ DirCache treeT = db.readDirCache();
- b.add(createEntry("d/o", FileMode.REGULAR_FILE));
- b.add(createEntry("d/t", FileMode.REGULAR_FILE));
+ DirCacheBuilder bTreeBuilder = treeB.builder();
+ DirCacheBuilder oTreeBuilder = treeO.builder();
+ DirCacheBuilder tTreeBuilder = treeT.builder();
- o.add(createEntry("d/o", FileMode.REGULAR_FILE));
- o.add(createEntry("d/t", FileMode.REGULAR_FILE, "o !"));
+ bTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
+ bTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE));
- t.add(createEntry("d/o", FileMode.REGULAR_FILE, "t !"));
- t.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));
+ oTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
+ oTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE, "o !"));
- b.finish();
- o.finish();
- t.finish();
- }
+ tTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE, "t !"));
+ tTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));
- final ObjectInserter ow = db.newObjectInserter();
- final ObjectId b = commit(ow, treeB, new ObjectId[] {});
- final ObjectId o = commit(ow, treeO, new ObjectId[] { b });
- final ObjectId t = commit(ow, treeT, new ObjectId[] { b });
+ bTreeBuilder.finish();
+ oTreeBuilder.finish();
+ tTreeBuilder.finish();
+
+ ObjectInserter ow = db.newObjectInserter();
+ ObjectId b = commit(ow, treeB, new ObjectId[] {});
+ ObjectId o = commit(ow, treeO, new ObjectId[] { b });
+ ObjectId t = commit(ow, treeT, new ObjectId[] { b });
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
@@ -246,31 +244,30 @@
@Test
public void testTrivialTwoWay_leftDFconflict1() throws Exception {
- final DirCache treeB = db.readDirCache();
- final DirCache treeO = db.readDirCache();
- final DirCache treeT = db.readDirCache();
- {
- final DirCacheBuilder b = treeB.builder();
- final DirCacheBuilder o = treeO.builder();
- final DirCacheBuilder t = treeT.builder();
+ DirCache treeB = db.readDirCache();
+ DirCache treeO = db.readDirCache();
+ DirCache treeT = db.readDirCache();
- b.add(createEntry("d/o", FileMode.REGULAR_FILE));
- b.add(createEntry("d/t", FileMode.REGULAR_FILE));
+ DirCacheBuilder bTreeBuilder = treeB.builder();
+ DirCacheBuilder oTreeBuilder = treeO.builder();
+ DirCacheBuilder tTreeBuilder = treeT.builder();
- o.add(createEntry("d", FileMode.REGULAR_FILE));
+ bTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
+ bTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE));
- t.add(createEntry("d/o", FileMode.REGULAR_FILE));
- t.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));
+ oTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE));
- b.finish();
- o.finish();
- t.finish();
- }
+ tTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
+ tTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE, "t !"));
- final ObjectInserter ow = db.newObjectInserter();
- final ObjectId b = commit(ow, treeB, new ObjectId[] {});
- final ObjectId o = commit(ow, treeO, new ObjectId[] { b });
- final ObjectId t = commit(ow, treeT, new ObjectId[] { b });
+ bTreeBuilder.finish();
+ oTreeBuilder.finish();
+ tTreeBuilder.finish();
+
+ ObjectInserter ow = db.newObjectInserter();
+ ObjectId b = commit(ow, treeB, new ObjectId[] {});
+ ObjectId o = commit(ow, treeO, new ObjectId[] { b });
+ ObjectId t = commit(ow, treeT, new ObjectId[] { b });
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
@@ -279,31 +276,30 @@
@Test
public void testTrivialTwoWay_rightDFconflict1() throws Exception {
- final DirCache treeB = db.readDirCache();
- final DirCache treeO = db.readDirCache();
- final DirCache treeT = db.readDirCache();
- {
- final DirCacheBuilder b = treeB.builder();
- final DirCacheBuilder o = treeO.builder();
- final DirCacheBuilder t = treeT.builder();
+ DirCache treeB = db.readDirCache();
+ DirCache treeO = db.readDirCache();
+ DirCache treeT = db.readDirCache();
- b.add(createEntry("d/o", FileMode.REGULAR_FILE));
- b.add(createEntry("d/t", FileMode.REGULAR_FILE));
+ DirCacheBuilder bTreeBuilder = treeB.builder();
+ DirCacheBuilder oTreeBuilder = treeO.builder();
+ DirCacheBuilder tTreeBuilder = treeT.builder();
- o.add(createEntry("d/o", FileMode.REGULAR_FILE));
- o.add(createEntry("d/t", FileMode.REGULAR_FILE, "o !"));
+ bTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
+ bTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE));
- t.add(createEntry("d", FileMode.REGULAR_FILE));
+ oTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
+ oTreeBuilder.add(createEntry("d/t", FileMode.REGULAR_FILE, "o !"));
- b.finish();
- o.finish();
- t.finish();
- }
+ tTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE));
- final ObjectInserter ow = db.newObjectInserter();
- final ObjectId b = commit(ow, treeB, new ObjectId[] {});
- final ObjectId o = commit(ow, treeO, new ObjectId[] { b });
- final ObjectId t = commit(ow, treeT, new ObjectId[] { b });
+ bTreeBuilder.finish();
+ oTreeBuilder.finish();
+ tTreeBuilder.finish();
+
+ ObjectInserter ow = db.newObjectInserter();
+ ObjectId b = commit(ow, treeB, new ObjectId[] {});
+ ObjectId o = commit(ow, treeO, new ObjectId[] { b });
+ ObjectId t = commit(ow, treeT, new ObjectId[] { b });
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
@@ -312,29 +308,28 @@
@Test
public void testTrivialTwoWay_leftDFconflict2() throws Exception {
- final DirCache treeB = db.readDirCache();
- final DirCache treeO = db.readDirCache();
- final DirCache treeT = db.readDirCache();
- {
- final DirCacheBuilder b = treeB.builder();
- final DirCacheBuilder o = treeO.builder();
- final DirCacheBuilder t = treeT.builder();
+ DirCache treeB = db.readDirCache();
+ DirCache treeO = db.readDirCache();
+ DirCache treeT = db.readDirCache();
- b.add(createEntry("d", FileMode.REGULAR_FILE));
+ DirCacheBuilder bTreeBuilder = treeB.builder();
+ DirCacheBuilder oTreeBuilder = treeO.builder();
+ DirCacheBuilder tTreeBuilder = treeT.builder();
- o.add(createEntry("d", FileMode.REGULAR_FILE, "o !"));
+ bTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE));
- t.add(createEntry("d/o", FileMode.REGULAR_FILE));
+ oTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE, "o !"));
- b.finish();
- o.finish();
- t.finish();
- }
+ tTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
- final ObjectInserter ow = db.newObjectInserter();
- final ObjectId b = commit(ow, treeB, new ObjectId[] {});
- final ObjectId o = commit(ow, treeO, new ObjectId[] { b });
- final ObjectId t = commit(ow, treeT, new ObjectId[] { b });
+ bTreeBuilder.finish();
+ oTreeBuilder.finish();
+ tTreeBuilder.finish();
+
+ ObjectInserter ow = db.newObjectInserter();
+ ObjectId b = commit(ow, treeB, new ObjectId[] {});
+ ObjectId o = commit(ow, treeO, new ObjectId[] { b });
+ ObjectId t = commit(ow, treeT, new ObjectId[] { b });
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
@@ -343,29 +338,28 @@
@Test
public void testTrivialTwoWay_rightDFconflict2() throws Exception {
- final DirCache treeB = db.readDirCache();
- final DirCache treeO = db.readDirCache();
- final DirCache treeT = db.readDirCache();
- {
- final DirCacheBuilder b = treeB.builder();
- final DirCacheBuilder o = treeO.builder();
- final DirCacheBuilder t = treeT.builder();
+ DirCache treeB = db.readDirCache();
+ DirCache treeO = db.readDirCache();
+ DirCache treeT = db.readDirCache();
- b.add(createEntry("d", FileMode.REGULAR_FILE));
+ DirCacheBuilder bTreeBuilder = treeB.builder();
+ DirCacheBuilder oTreeBuilder = treeO.builder();
+ DirCacheBuilder tTreeBuilder = treeT.builder();
- o.add(createEntry("d/o", FileMode.REGULAR_FILE));
+ bTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE));
- t.add(createEntry("d", FileMode.REGULAR_FILE, "t !"));
+ oTreeBuilder.add(createEntry("d/o", FileMode.REGULAR_FILE));
- b.finish();
- o.finish();
- t.finish();
- }
+ tTreeBuilder.add(createEntry("d", FileMode.REGULAR_FILE, "t !"));
- final ObjectInserter ow = db.newObjectInserter();
- final ObjectId b = commit(ow, treeB, new ObjectId[] {});
- final ObjectId o = commit(ow, treeO, new ObjectId[] { b });
- final ObjectId t = commit(ow, treeT, new ObjectId[] { b });
+ bTreeBuilder.finish();
+ oTreeBuilder.finish();
+ tTreeBuilder.finish();
+
+ ObjectInserter ow = db.newObjectInserter();
+ ObjectId b = commit(ow, treeB, new ObjectId[] {});
+ ObjectId o = commit(ow, treeO, new ObjectId[] { b });
+ ObjectId t = commit(ow, treeT, new ObjectId[] { b });
Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
boolean merge = ourMerger.merge(new ObjectId[] { o, t });
@@ -377,10 +371,9 @@
.getObjectId(0));
}
- private static ObjectId commit(final ObjectInserter odi,
- final DirCache treeB,
- final ObjectId[] parentIds) throws Exception {
- final CommitBuilder c = new CommitBuilder();
+ private static ObjectId commit(ObjectInserter odi, DirCache treeB,
+ ObjectId[] parentIds) throws Exception {
+ CommitBuilder c = new CommitBuilder();
c.setTreeId(treeB.writeTree(odi));
c.setAuthor(new PersonIdent("A U Thor", "a.u.thor", 1L, 0));
c.setCommitter(c.getAuthor());
diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index 380db25..10d0de0 100644
--- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
@@ -4,14 +4,14 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.ui
Bundle-SymbolicName: org.eclipse.jgit.ui
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.awtui;version="5.8.1"
-Import-Package: org.eclipse.jgit.errors;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.lib;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.nls;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revplot;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.revwalk;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.transport;version="[5.8.1,5.9.0)",
- org.eclipse.jgit.util;version="[5.8.1,5.9.0)"
+Export-Package: org.eclipse.jgit.awtui;version="5.9.0"
+Import-Package: org.eclipse.jgit.errors;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.lib;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.nls;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revplot;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.transport;version="[5.9.0,5.10.0)",
+ org.eclipse.jgit.util;version="[5.9.0,5.10.0)"
diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF
index cec32cc..e3f611f 100644
--- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.ui - Sources
Bundle-SymbolicName: org.eclipse.jgit.ui.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.8.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.8.1.qualifier";roots="."
+Bundle-Version: 5.9.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.9.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml
index d82b412..717e74e 100644
--- a/org.eclipse.jgit.ui/pom.xml
+++ b/org.eclipse.jgit.ui/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ui</artifactId>
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 2689ee4..617292b 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -3,12 +3,12 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit
Bundle-SymbolicName: org.eclipse.jgit
-Bundle-Version: 5.8.1.qualifier
+Bundle-Version: 5.9.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Eclipse-ExtensibleAPI: true
-Export-Package: org.eclipse.jgit.annotations;version="5.8.1",
- org.eclipse.jgit.api;version="5.8.1";
+Export-Package: org.eclipse.jgit.annotations;version="5.9.0",
+ org.eclipse.jgit.api;version="5.9.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.notes,
org.eclipse.jgit.dircache,
@@ -23,18 +23,18 @@
org.eclipse.jgit.revwalk.filter,
org.eclipse.jgit.blame,
org.eclipse.jgit.merge",
- org.eclipse.jgit.api.errors;version="5.8.1";
+ org.eclipse.jgit.api.errors;version="5.9.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.errors",
- org.eclipse.jgit.attributes;version="5.8.1";
+ org.eclipse.jgit.attributes;version="5.9.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk",
- org.eclipse.jgit.blame;version="5.8.1";
+ org.eclipse.jgit.blame;version="5.9.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff",
- org.eclipse.jgit.diff;version="5.8.1";
+ org.eclipse.jgit.diff;version="5.9.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.attributes,
org.eclipse.jgit.revwalk,
@@ -42,47 +42,47 @@
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util",
- org.eclipse.jgit.dircache;version="5.8.1";
+ org.eclipse.jgit.dircache;version="5.9.0";
uses:="org.eclipse.jgit.events,
org.eclipse.jgit.lib,
org.eclipse.jgit.attributes,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util",
- org.eclipse.jgit.errors;version="5.8.1";
+ org.eclipse.jgit.errors;version="5.9.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.internal.storage.pack",
- org.eclipse.jgit.events;version="5.8.1";
+ org.eclipse.jgit.events;version="5.9.0";
uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.fnmatch;version="5.8.1",
- org.eclipse.jgit.gitrepo;version="5.8.1";
+ org.eclipse.jgit.fnmatch;version="5.9.0",
+ org.eclipse.jgit.gitrepo;version="5.9.0";
uses:="org.xml.sax.helpers,
org.eclipse.jgit.api,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.xml.sax",
- org.eclipse.jgit.gitrepo.internal;version="5.8.1";x-internal:=true,
- org.eclipse.jgit.hooks;version="5.8.1";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.ignore;version="5.8.1",
- org.eclipse.jgit.ignore.internal;version="5.8.1";
+ org.eclipse.jgit.gitrepo.internal;version="5.9.0";x-internal:=true,
+ org.eclipse.jgit.hooks;version="5.9.0";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.ignore;version="5.9.0",
+ org.eclipse.jgit.ignore.internal;version="5.9.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal;version="5.8.1";
+ org.eclipse.jgit.internal;version="5.9.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.http.test",
- org.eclipse.jgit.internal.fsck;version="5.8.1";
+ org.eclipse.jgit.internal.fsck;version="5.9.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.ketch;version="5.8.1";
+ org.eclipse.jgit.internal.ketch;version="5.9.0";
x-friends:="org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.revwalk;version="5.8.1";x-internal:=true,
- org.eclipse.jgit.internal.storage.dfs;version="5.8.1";
+ org.eclipse.jgit.internal.revwalk;version="5.9.0";x-internal:=true,
+ org.eclipse.jgit.internal.storage.dfs;version="5.9.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.http.server,
org.eclipse.jgit.http.test,
org.eclipse.jgit.lfs.test",
- org.eclipse.jgit.internal.storage.file;version="5.8.1";
+ org.eclipse.jgit.internal.storage.file;version="5.9.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.junit,
org.eclipse.jgit.junit.http,
@@ -91,35 +91,35 @@
org.eclipse.jgit.pgm,
org.eclipse.jgit.pgm.test,
org.eclipse.jgit.ssh.apache",
- org.eclipse.jgit.internal.storage.io;version="5.8.1";
+ org.eclipse.jgit.internal.storage.io;version="5.9.0";
x-friends:="org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.pack;version="5.8.1";
+ org.eclipse.jgit.internal.storage.pack;version="5.9.0";
x-friends:="org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.reftable;version="5.8.1";
+ org.eclipse.jgit.internal.storage.reftable;version="5.9.0";
x-friends:="org.eclipse.jgit.http.test,
org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.reftree;version="5.8.1";
+ org.eclipse.jgit.internal.storage.reftree;version="5.9.0";
x-friends:="org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.submodule;version="5.8.1";x-internal:=true,
- org.eclipse.jgit.internal.transport.connectivity;version="5.8.1";
+ org.eclipse.jgit.internal.submodule;version="5.9.0";x-internal:=true,
+ org.eclipse.jgit.internal.transport.connectivity;version="5.9.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.http;version="5.8.1";
+ org.eclipse.jgit.internal.transport.http;version="5.9.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.parser;version="5.8.1";
+ org.eclipse.jgit.internal.transport.parser;version="5.9.0";
x-friends:="org.eclipse.jgit.http.server,
org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.ssh;version="5.8.1";
+ org.eclipse.jgit.internal.transport.ssh;version="5.9.0";
x-friends:="org.eclipse.jgit.ssh.apache,
org.eclipse.jgit.ssh.jsch",
- org.eclipse.jgit.lib;version="5.8.1";
+ org.eclipse.jgit.lib;version="5.9.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util.sha1,
org.eclipse.jgit.dircache,
@@ -133,9 +133,9 @@
org.eclipse.jgit.util,
org.eclipse.jgit.submodule,
org.eclipse.jgit.util.time",
- org.eclipse.jgit.lib.internal;version="5.8.1";
+ org.eclipse.jgit.lib.internal;version="5.9.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.merge;version="5.8.1";
+ org.eclipse.jgit.merge;version="5.9.0";
uses:="org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
@@ -144,40 +144,40 @@
org.eclipse.jgit.util,
org.eclipse.jgit.api,
org.eclipse.jgit.attributes",
- org.eclipse.jgit.nls;version="5.8.1",
- org.eclipse.jgit.notes;version="5.8.1";
+ org.eclipse.jgit.nls;version="5.9.0",
+ org.eclipse.jgit.notes;version="5.9.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.merge",
- org.eclipse.jgit.patch;version="5.8.1";
+ org.eclipse.jgit.patch;version="5.9.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.diff",
- org.eclipse.jgit.revplot;version="5.8.1";
+ org.eclipse.jgit.revplot;version="5.9.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk",
- org.eclipse.jgit.revwalk;version="5.8.1";
+ org.eclipse.jgit.revwalk;version="5.9.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.diff,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.revwalk.filter,
org.eclipse.jgit.treewalk",
- org.eclipse.jgit.revwalk.filter;version="5.8.1";
+ org.eclipse.jgit.revwalk.filter;version="5.9.0";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.lib,
org.eclipse.jgit.util",
- org.eclipse.jgit.storage.file;version="5.8.1";
+ org.eclipse.jgit.storage.file;version="5.9.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.util",
- org.eclipse.jgit.storage.pack;version="5.8.1";
+ org.eclipse.jgit.storage.pack;version="5.9.0";
uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.submodule;version="5.8.1";
+ org.eclipse.jgit.submodule;version="5.9.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.diff,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util",
- org.eclipse.jgit.transport;version="5.8.1";
+ org.eclipse.jgit.transport;version="5.9.0";
uses:="javax.crypto,
org.eclipse.jgit.util.io,
org.eclipse.jgit.lib,
@@ -190,21 +190,21 @@
org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.storage.pack,
org.eclipse.jgit.errors",
- org.eclipse.jgit.transport.http;version="5.8.1";
+ org.eclipse.jgit.transport.http;version="5.9.0";
uses:="javax.net.ssl",
- org.eclipse.jgit.transport.resolver;version="5.8.1";
+ org.eclipse.jgit.transport.resolver;version="5.9.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.lib",
- org.eclipse.jgit.treewalk;version="5.8.1";
+ org.eclipse.jgit.treewalk;version="5.9.0";
uses:="org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.attributes,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util",
- org.eclipse.jgit.treewalk.filter;version="5.8.1";
+ org.eclipse.jgit.treewalk.filter;version="5.9.0";
uses:="org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util;version="5.8.1";
+ org.eclipse.jgit.util;version="5.9.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.hooks,
org.eclipse.jgit.revwalk,
@@ -217,12 +217,12 @@
org.eclipse.jgit.treewalk,
javax.net.ssl,
org.eclipse.jgit.util.time",
- org.eclipse.jgit.util.io;version="5.8.1";
+ org.eclipse.jgit.util.io;version="5.9.0";
uses:="org.eclipse.jgit.attributes,
org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util.sha1;version="5.8.1",
- org.eclipse.jgit.util.time;version="5.8.1"
+ org.eclipse.jgit.util.sha1;version="5.9.0",
+ org.eclipse.jgit.util.time;version="5.9.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
javax.crypto,
diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
index 7b26360..d248971 100644
--- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit - Sources
Bundle-SymbolicName: org.eclipse.jgit.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.8.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit;version="5.8.1.qualifier";roots="."
+Bundle-Version: 5.9.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit;version="5.9.0.qualifier";roots="."
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index 23b450a..d891434 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit</artifactId>
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java
index c9bb167..ec53818 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackBitmapIndex.java
@@ -59,12 +59,26 @@
* @return the full bitmap
*/
EWAHCompressedBitmap getBitmap() {
+ EWAHCompressedBitmap bitmap = getBitmapWithoutCaching();
+ // Cache the result.
+ bitmapContainer = bitmap;
+ return bitmap;
+ }
+
+ /**
+ * Compute and return the full bitmap, do NOT cache the expanded bitmap,
+ * which saves memory and should only be used during bitmap creation in
+ * garbage collection.
+ *
+ * @return the full bitmap
+ */
+ EWAHCompressedBitmap getBitmapWithoutCaching() {
// Fast path to immediately return the expanded result.
Object r = bitmapContainer;
if (r instanceof EWAHCompressedBitmap)
return (EWAHCompressedBitmap) r;
- // Expand the bitmap and cache the result.
+ // Expand the bitmap but not cache the result.
XorCompressedBitmap xb = (XorCompressedBitmap) r;
EWAHCompressedBitmap out = xb.bitmap;
for (;;) {
@@ -72,7 +86,6 @@
if (r instanceof EWAHCompressedBitmap) {
out = out.xor((EWAHCompressedBitmap) r);
out.trim();
- bitmapContainer = out;
return out;
}
xb = (XorCompressedBitmap) r;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java
index 4b25284..dd5d03c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java
@@ -156,7 +156,8 @@
return null;
inflated.clear();
- for (IntIterator i = oldBitmap.getBitmap().intIterator(); i.hasNext();)
+ for (IntIterator i = oldBitmap.getBitmapWithoutCaching()
+ .intIterator(); i.hasNext();)
inflated.set(prevToNewMapping[i.next()]);
bitmap = inflated.toEWAHCompressedBitmap();
bitmap.trim();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/MergedReftable.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/MergedReftable.java
index 3633515..a78f4d2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/MergedReftable.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/MergedReftable.java
@@ -82,7 +82,7 @@
return 0;
}
long minUpdateIndex = tables[0].minUpdateIndex();
- for (int i = 0; i < tables.length - 1; i++) {
+ for (int i = 1; i < tables.length; i++) {
if (tables[i].minUpdateIndex() < minUpdateIndex) {
minUpdateIndex = tables[i].minUpdateIndex();
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BitmapIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BitmapIndex.java
index f6695bd..b11b230 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BitmapIndex.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BitmapIndex.java
@@ -86,7 +86,7 @@
/**
* Returns the corresponding raw compressed EWAH bitmap of the bitmap.
- *
+ *
* @return the corresponding {@code EWAHCompressedBitmap}
* @since 5.8
*/
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshSessionFactory.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshSessionFactory.java
index ef845f4..c299388 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshSessionFactory.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshSessionFactory.java
@@ -43,7 +43,7 @@
}
return null;
}
-
+
/**
* Get the currently configured JVM-wide factory.
* <p>
diff --git a/pom.xml b/pom.xml
index 272957b..07c52c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<packaging>pom</packaging>
- <version>5.8.1-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
<name>JGit - Parent</name>
<url>${jgit-url}</url>
@@ -33,13 +33,13 @@
</description>
<scm>
- <url>http://git.eclipse.org/c/jgit/jgit.git/</url>
+ <url>https://git.eclipse.org/r/plugins/gitiles/jgit/jgit</url>
<connection>scm:git:https://git.eclipse.org/r/jgit/jgit</connection>
</scm>
<ciManagement>
- <system>hudson</system>
- <url>https://hudson.eclipse.org/jgit/</url>
+ <system>Jenkins</system>
+ <url>https://ci.eclipse.org/jgit</url>
</ciManagement>
<developers>
@@ -140,7 +140,7 @@
</licenses>
<properties>
- <jgit-url>http://www.eclipse.org/jgit/</jgit-url>
+ <jgit-url>https://www.eclipse.org/jgit/</jgit-url>
<jgit-copyright>Copyright (c) 2005, 2009 Shawn Pearce, Robin Rosenberg, et.al.</jgit-copyright>
<jgit.website.url>scp://build.eclipse.org/home/data/httpd/download.eclipse.org/jgit/site/${project.version}/</jgit.website.url>
@@ -151,7 +151,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest>
- <jgit-last-release-version>5.7.0.202003110725-r</jgit-last-release-version>
+ <jgit-last-release-version>5.8.0.202006091008-r</jgit-last-release-version>
<apache-sshd-version>2.4.0</apache-sshd-version>
<jsch-version>0.1.55</jsch-version>
<jzlib-version>1.1.1</jzlib-version>
@@ -895,7 +895,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
- <version>3.21.0</version>
+ <version>3.22.0</version>
</dependency>
</dependencies>
</plugin>
@@ -924,12 +924,6 @@
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200a-plugin</artifactId>
- <!-- TODO remove this configuration when https://git.eclipse.org/r/#/c/16027 is available -->
- <configuration>
- <supportedProjectTypes>
- <supportedProjectType>jar</supportedProjectType>
- </supportedProjectTypes>
- </configuration>
<executions>
<execution>
<id>pack200-normalize</id>
@@ -956,12 +950,6 @@
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200b-plugin</artifactId>
- <!-- TODO remove this configuration when https://git.eclipse.org/r/#/c/16027 is available -->
- <configuration>
- <supportedProjectTypes>
- <supportedProjectType>jar</supportedProjectType>
- </supportedProjectTypes>
- </configuration>
<executions>
<execution>
<id>pack200-pack</id>
