Merge branch 'stable-5.9'
* stable-5.9:
Bump Bazel version to 3.5.0
Change-Id: Ic96a2918c34696d31af5104305201e8426989a9d
Signed-off-by: Marco Miller <marco.miller@ericsson.com>
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index b454e1b..0147f22 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.9.0.qualifier
+Bundle-Version: 5.10.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.tools.ant,
- 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.eclipse.jgit.ant.tasks;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.junit;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.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 d70f4be..dc76aa2 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 2e1f908..e26c2c8 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.9.0.qualifier
+Bundle-Version: 5.10.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)"
+ org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)"
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.ant;version="5.9.0",
- org.eclipse.jgit.ant.tasks;version="5.9.0";
+Export-Package: org.eclipse.jgit.ant;version="5.10.0",
+ org.eclipse.jgit.ant.tasks;version="5.10.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 aadb6e0..ea0fd23 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.9.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.9.0.qualifier";roots="."
+Bundle-Version: 5.10.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.10.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml
index 5e94e1a..042030b 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 bf369bc..a9e6d0a 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.9.0.qualifier
+Bundle-Version: 5.10.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.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.eclipse.jgit.api;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.nls;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.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.9.0";
+Export-Package: org.eclipse.jgit.archive;version="5.10.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.9.0";x-internal:=true
+ org.eclipse.jgit.archive.internal;version="5.10.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 eabb7c3..93f614f 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.9.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.9.0.qualifier";roots="."
+Bundle-Version: 5.10.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.10.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml
index da951da..076c693 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 5778056..3256c43 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 fa413a3..db9c735 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.9.0-SNAPSHOT</version>
+ <version>5.10.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.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ant</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.archive</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.apache</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.server</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.server</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ui</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.test</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ant.test</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.test</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm.test</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.test</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.server.test</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
- <version>5.9.0-SNAPSHOT</version>
+ <version>5.10.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 aa3d90f..02dbf8e 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.9.0.qualifier
+Bundle-Version: 5.10.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.gpg.bc.internal;version="[5.9.0,5.10.0)",
+Import-Package: org.eclipse.jgit.gpg.bc.internal;version="[5.10.0,5.11.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 495755d..e0ee7f9 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 82ce42a..e4bca93 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.9.0,5.10.0)"
+Fragment-Host: org.eclipse.jgit;bundle-version="[5.10.0,5.11.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
-Bundle-Version: 5.9.0.qualifier
+Bundle-Version: 5.10.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.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.eclipse.jgit.annotations;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.nls;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.0)",
org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.gpg.bc.internal;version="5.9.0";
+Export-Package: org.eclipse.jgit.gpg.bc.internal;version="5.10.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 a250123..e504a8c 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.9.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.9.0.qualifier";roots="."
+Bundle-Version: 5.10.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.10.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml
index 91d6c24..bb80475 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 3910fab..ead8e9c 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.9.0.qualifier
+Bundle-Version: 5.10.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.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";
+ org.eclipse.jgit.annotations;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.nls;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport.http;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.0)"
+Export-Package: org.eclipse.jgit.transport.http.apache;version="5.10.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 a26e7eb..577d506 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.9.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.9.0.qualifier";roots="."
+Bundle-Version: 5.10.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.10.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml
index 170b676..e6761c4 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 9a922d0..9dcc3ef 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.9.0.qualifier
+Bundle-Version: 5.10.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.http.server;version="5.9.0",
- org.eclipse.jgit.http.server.glue;version="5.9.0";
+Export-Package: org.eclipse.jgit.http.server;version="5.10.0",
+ org.eclipse.jgit.http.server.glue;version="5.10.0";
uses:="javax.servlet,javax.servlet.http",
- org.eclipse.jgit.http.server.resolver;version="5.9.0";
+ org.eclipse.jgit.http.server.resolver;version="5.10.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.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)"
+ org.eclipse.jgit.annotations;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.nls;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.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 db03710..82fb3a9 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.9.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.9.0.qualifier";roots="."
+Bundle-Version: 5.10.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.10.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index 18a8834..929eba6 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 a4d096b..b5dc580 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.9.0.qualifier
+Bundle-Version: 5.10.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.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.eclipse.jgit.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.http.server;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.http.server.glue;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.http.server.resolver;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.junit;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.junit.http;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.nls;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport.http;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.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 c643166..b619f8f 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 3a8145f..0130f3c 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.9.0.qualifier
+Bundle-Version: 5.10.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.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.eclipse.jgit.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.http.server;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.junit;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.10.0,5.11.0)",
org.junit;version="[4.13,5.0.0)"
-Export-Package: org.eclipse.jgit.junit.http;version="5.9.0";
+Export-Package: org.eclipse.jgit.junit.http;version="5.10.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 38a8c57..e3eae5b 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.9.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.9.0.qualifier";roots="."
+Bundle-Version: 5.10.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.10.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml
index 220952a..a0e24fe 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 2bf9c1f..839ff26 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.9.0.qualifier
+Bundle-Version: 5.10.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
@@ -30,16 +30,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.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.eclipse.jgit.annotations;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.api;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.junit;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.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.9.0"
+Export-Package: org.eclipse.jgit.junit.ssh;version="5.10.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 ccb341e..cc66754 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.9.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.9.0.qualifier";roots="."
+Bundle-Version: 5.10.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.10.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml
index e1d35ce..5c8110e 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 41543a0..3fed43b 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.9.0.qualifier
+Bundle-Version: 5.10.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.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)",
+Import-Package: org.eclipse.jgit.annotations;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.api;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.dircache;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.merge;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="5.10.0",
+ org.eclipse.jgit.treewalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util.io;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util.time;version="[5.10.0,5.11.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.9.0";
+Export-Package: org.eclipse.jgit.junit;version="5.10.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.9.0";uses:="org.eclipse.jgit.util.time"
+ org.eclipse.jgit.junit.time;version="5.10.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 3363e71..cc88d53 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.9.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.9.0.qualifier";roots="."
+Bundle-Version: 5.10.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.10.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml
index 82fe656..c08a73a 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.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit</artifactId>
diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java
index de11e2c..cc84f19 100644
--- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java
+++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java
@@ -34,6 +34,7 @@
import org.eclipse.jgit.dircache.DirCacheCheckout;
import org.eclipse.jgit.dircache.DirCacheEntry;
import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
@@ -513,6 +514,21 @@
}
/**
+ * Create <code>DirCacheEntry</code>
+ *
+ * @param path
+ * @param objectId
+ * @return the DirCacheEntry
+ */
+ protected DirCacheEntry createGitLink(String path, AnyObjectId objectId) {
+ final DirCacheEntry entry = new DirCacheEntry(path,
+ DirCacheEntry.STAGE_0);
+ entry.setFileMode(FileMode.GITLINK);
+ entry.setObjectId(objectId);
+ return entry;
+ }
+
+ /**
* Assert files are equal
*
* @param expected
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 5e41446..db6d6a7 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.9.0.qualifier
+Bundle-Version: 5.10.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.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.eclipse.jgit.api;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.junit;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.junit.http;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs.server;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs.test;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.treewalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.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 f8fb301..c98a0dd 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 979352c..20dd5f1 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.9.0.qualifier
+Bundle-Version: 5.10.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs.server;version="5.9.0";
+Export-Package: org.eclipse.jgit.lfs.server;version="5.10.0";
uses:="javax.servlet.http,
org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.fs;version="5.9.0";
+ org.eclipse.jgit.lfs.server.fs;version="5.10.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.9.0";x-internal:=true,
- org.eclipse.jgit.lfs.server.s3;version="5.9.0";
+ org.eclipse.jgit.lfs.server.internal;version="5.10.0";x-internal:=true,
+ org.eclipse.jgit.lfs.server.s3;version="5.10.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.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.eclipse.jgit.annotations;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs.internal;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.nls;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport.http;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.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 453f128..9fbafd2 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.9.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.9.0.qualifier";roots="."
+Bundle-Version: 5.10.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.10.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml
index 6f9fd20..39f59b4 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 44c5350..e9affdb 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.9.0.qualifier
+Bundle-Version: 5.10.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-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)",
+Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.junit;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.treewalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.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.9.0";x-friends:="org.eclipse.jgit.lfs.server.test"
+Export-Package: org.eclipse.jgit.lfs.test;version="5.10.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 6e4decd..ce520c7 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 ced8ad4..e9a396a 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.9.0.qualifier
+Bundle-Version: 5.10.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-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"
+Export-Package: org.eclipse.jgit.lfs;version="5.10.0",
+ org.eclipse.jgit.lfs.errors;version="5.10.0",
+ org.eclipse.jgit.lfs.internal;version="5.10.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.10.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.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)"
+ org.eclipse.jgit.annotations;version="[5.10.0,5.11.0)";resolution:=optional,
+ org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.attributes;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.diff;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.hooks;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.nls;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.storage.pack;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport.http;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.treewalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util.io;version="[5.10.0,5.11.0)"
diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
index ac6a4a4..249793a 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.9.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.9.0.qualifier";roots="."
+Bundle-Version: 5.10.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.10.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml
index 0922a69..b6480bd 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 823c872..c05f29c 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.9.0.qualifier"
+ version="5.10.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 aac5072..f3686fd 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 73e139a..383287a 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.9.0.qualifier"
+ version="5.10.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.9.0" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="5.10.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 b7dc720..22b4f48 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 d912aa8..067436f 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.9.0.qualifier"
+ version="5.10.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.9.0" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="5.10.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 f0665a6..9783146 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 78077e8..3d79878 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.9.0.qualifier"
+ version="5.10.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.9.0" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="5.10.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 1368626..2354bf2 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 474e8ff..cfdb6aa 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.9.0.qualifier"
+ version="5.10.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.9.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.10.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 756b068..90d56d3 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 bbf1977..be73583 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.9.0.qualifier"
+ version="5.10.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.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"/>
+ <import feature="org.eclipse.jgit" version="5.10.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit.lfs" version="5.10.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit.ssh.apache" version="5.10.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 55c6fdb..8fcfcc3 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 1e34ba2..b2d2d96 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 a326fb7..f4061c9 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.9.0.qualifier"
+ version="5.10.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.9.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.10.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 4ccf310..6b53b70 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.9.0-SNAPSHOT</version>
+ <version>5.10.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.9.0-SNAPSHOT</version>
+ <version>5.10.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 39b3c79..c1c251a 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.9.0.qualifier"
+ version="5.10.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.9.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.10.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 8932185..84d46f7 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 1ebe151..8edf546 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.9.0.qualifier"
+ version="5.10.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.9.0" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="5.10.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 2a98697..1c37253 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 098f767..62a9ccb 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.9.0.qualifier
+Bundle-Version: 5.10.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 abff8ba..640ce31 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 141de30..8fcfae3 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 34f1e0f..1027a94 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.9.0.qualifier
+Bundle-Version: 5.10.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.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)",
+Import-Package: org.eclipse.jgit.api;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.diff;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.dircache;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.file;version="5.10.0",
+ org.eclipse.jgit.junit;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.merge;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.pgm;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.pgm.internal;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.pgm.opt;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.treewalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util.io;version="[5.10.0,5.11.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 725ad1b..4713e2d 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 a564aac..23191ac 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.9.0.qualifier
+Bundle-Version: 5.10.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.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.eclipse.jgit.api;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.archive;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.awtui;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.blame;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.diff;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.dircache;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.gitrepo;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.ketch;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.io;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.reftree;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs.server;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs.server.s3;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.merge;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.nls;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.notes;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revplot;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.storage.pack;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport.sshd;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.treewalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util.io;version="[5.10.0,5.11.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.9.0";
+Export-Package: org.eclipse.jgit.console;version="5.10.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util",
- org.eclipse.jgit.pgm;version="5.9.0";
+ org.eclipse.jgit.pgm;version="5.10.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.9.0";
+ org.eclipse.jgit.pgm.debug;version="5.10.0";
uses:="org.eclipse.jgit.util.io,
org.eclipse.jgit.pgm,
org.eclipse.jetty.servlet",
- org.eclipse.jgit.pgm.internal;version="5.9.0";
+ org.eclipse.jgit.pgm.internal;version="5.10.0";
x-friends:="org.eclipse.jgit.pgm.test,
org.eclipse.jgit.test",
- org.eclipse.jgit.pgm.opt;version="5.9.0";
+ org.eclipse.jgit.pgm.opt;version="5.10.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 19cd15e..1dc6f20 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.9.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.9.0.qualifier";roots="."
+Bundle-Version: 5.10.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.10.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index 5338cb8..a3ff9a0 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 c4ffda9..47f0069 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.9.0.qualifier
+Bundle-Version: 5.10.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -16,15 +16,15 @@
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;version="[2.4.0,2.5.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.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.eclipse.jgit.api;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.junit;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.junit.ssh;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport.sshd;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.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 ca7424d..fb28377 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 26d318d..e6ccbec 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.9.0.qualifier
+Bundle-Version: 5.10.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.9.0";x-internal:=true;
+Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.10.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.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";
+ org.eclipse.jgit.internal.transport.sshd.auth;version="5.10.0";x-internal:=true,
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="5.10.0";x-friends:="org.eclipse.jgit.ssh.apache.test",
+ org.eclipse.jgit.transport.sshd;version="5.10.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.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.eclipse.jgit.annotations;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.fnmatch;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.nls;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.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 53b5336..8084764 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.9.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.9.0.qualifier";roots="."
+Bundle-Version: 5.10.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.10.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml
index 6b5b7f8..4eb9cc7 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 3e902e4..5b6defa 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.9.0.qualifier
+Bundle-Version: 5.10.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.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.eclipse.jgit.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.junit;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.junit.ssh;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.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.9.0";
+Export-Package: org.eclipse.jgit.transport;version="5.10.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 10acfd2..559e92c 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 c72b339..9e81eeb 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.9.0,5.10.0)"
+Fragment-Host: org.eclipse.jgit;bundle-version="[5.10.0,5.11.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
-Bundle-Version: 5.9.0.qualifier
+Bundle-Version: 5.10.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-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";
+Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.10.0";x-friends:="org.eclipse.egit.core",
+ org.eclipse.jgit.transport;version="5.10.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.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.eclipse.jgit.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.nls;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util.io;version="[5.10.0,5.11.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 7048f27..dd42333 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.9.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.9.0.qualifier";roots="."
+Bundle-Version: 5.10.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.10.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml
index 93f3544..dd59f79 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 06f3c4d..3f3f030 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.9.0.qualifier
+Bundle-Version: 5.10.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.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.eclipse.jgit.annotations;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.api;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.archive;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.attributes;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.awtui;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.blame;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.diff;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.dircache;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.events;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.fnmatch;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.gitrepo;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.hooks;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.ignore;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.ignore.internal;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.fsck;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.io;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.storage.reftree;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.transport.connectivity;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.transport.http;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.junit;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.junit.time;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lfs;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib.internal;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.merge;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.nls;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.notes;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.patch;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.pgm;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.pgm.internal;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revplot;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.storage.pack;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.submodule;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport.http;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.treewalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util.io;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util.sha1;version="[5.10.0,5.11.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 e94547c..100bd11 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.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.test</artifactId>
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBundleWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBundleWriterTest.java
new file mode 100644
index 0000000..4238ee6
--- /dev/null
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBundleWriterTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2020, Google LLC and others
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Distribution License v. 1.0 which is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+package org.eclipse.jgit.internal.storage.dfs;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Set;
+
+import org.eclipse.jgit.junit.TestRepository;
+import org.eclipse.jgit.lib.NullProgressMonitor;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.transport.FetchResult;
+import org.eclipse.jgit.transport.RefSpec;
+import org.eclipse.jgit.transport.TransportBundleStream;
+import org.eclipse.jgit.transport.URIish;
+import org.junit.Before;
+import org.junit.Test;
+
+public class DfsBundleWriterTest {
+ private TestRepository<InMemoryRepository> git;
+
+ private InMemoryRepository repo;
+
+ @Before
+ public void setUp() throws IOException {
+ DfsRepositoryDescription desc = new DfsRepositoryDescription("test");
+ git = new TestRepository<>(new InMemoryRepository(desc));
+ repo = git.getRepository();
+ }
+
+ @Test
+ public void testRepo() throws Exception {
+ RevCommit commit0 = git.commit().message("0").create();
+ RevCommit commit1 = git.commit().message("1").parent(commit0).create();
+ git.update("master", commit1);
+
+ RevCommit commit2 = git.commit().message("0").create();
+
+ byte[] bundle = makeBundle();
+ try (Repository newRepo = new InMemoryRepository(
+ new DfsRepositoryDescription("copy"))) {
+ fetchFromBundle(newRepo, bundle);
+ Ref ref = newRepo.exactRef("refs/heads/master");
+ assertNotNull(ref);
+ assertEquals(commit1.toObjectId(), ref.getObjectId());
+
+ // Unreferenced objects are included as well.
+ assertTrue(newRepo.getObjectDatabase().has(commit2));
+ }
+ }
+
+ private byte[] makeBundle() throws IOException {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ DfsBundleWriter.writeEntireRepositoryAsBundle(
+ NullProgressMonitor.INSTANCE, out, repo);
+ return out.toByteArray();
+ }
+
+ private static FetchResult fetchFromBundle(Repository newRepo,
+ byte[] bundle) throws Exception {
+ URIish uri = new URIish("in-memory://");
+ ByteArrayInputStream in = new ByteArrayInputStream(bundle);
+ RefSpec rs = new RefSpec("refs/heads/*:refs/heads/*");
+ Set<RefSpec> refs = Collections.singleton(rs);
+ try (TransportBundleStream transport = new TransportBundleStream(
+ newRepo, uri, in)) {
+ return transport.fetch(NullProgressMonitor.INSTANCE, refs);
+ }
+ }
+}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java
new file mode 100644
index 0000000..c850b4d
--- /dev/null
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java
@@ -0,0 +1,368 @@
+/*
+ * Copyright (c) 2020, Google LLC and others
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Distribution License v. 1.0 which is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+package org.eclipse.jgit.merge;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+
+import org.eclipse.jgit.annotations.Nullable;
+import org.eclipse.jgit.dircache.DirCache;
+import org.eclipse.jgit.dircache.DirCacheBuilder;
+import org.eclipse.jgit.dircache.DirCacheEntry;
+import org.eclipse.jgit.lib.CommitBuilder;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.ObjectInserter;
+import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase;
+import org.eclipse.jgit.treewalk.TreeWalk;
+import org.junit.Test;
+
+public class GitlinkMergeTest extends SampleDataRepositoryTestCase {
+ private static final String LINK_ID1 = "DEADBEEFDEADBEEFBABEDEADBEEFDEADBEEFBABE";
+ private static final String LINK_ID2 = "DEADDEADDEADDEADDEADDEADDEADDEADDEADDEAD";
+ private static final String LINK_ID3 = "BEEFBEEFBEEFBEEFBEEFBEEFBEEFBEEFBEEFBEEF";
+
+ private static final String SUBMODULE_PATH = "submodule.link";
+
+ @Test
+ public void testGitLinkMerging_AddNew() throws Exception {
+ assertGitLinkValue(
+ testGitLink(null, null, LINK_ID3, newResolveMerger(), true),
+ LINK_ID3);
+ }
+
+ @Test
+ public void testGitLinkMerging_Delete() throws Exception {
+ assertGitLinkDoesntExist(testGitLink(LINK_ID1, LINK_ID1, null,
+ newResolveMerger(), true));
+ }
+
+ @Test
+ public void testGitLinkMerging_UpdateDelete() throws Exception {
+ testGitLink(LINK_ID1, LINK_ID2, null, newResolveMerger(), false);
+ }
+
+ @Test
+ public void testGitLinkMerging_DeleteUpdate() throws Exception {
+ testGitLink(LINK_ID1, null, LINK_ID3, newResolveMerger(), false);
+ }
+
+ @Test
+ public void testGitLinkMerging_UpdateUpdate() throws Exception {
+ testGitLink(LINK_ID1, LINK_ID2, LINK_ID3, newResolveMerger(), false);
+ }
+
+ @Test
+ public void testGitLinkMerging_bothAddedSameLink() throws Exception {
+ assertGitLinkValue(
+ testGitLink(null, LINK_ID2, LINK_ID2, newResolveMerger(), true),
+ LINK_ID2);
+ }
+
+ @Test
+ public void testGitLinkMerging_bothAddedDifferentLink() throws Exception {
+ testGitLink(null, LINK_ID2, LINK_ID3, newResolveMerger(), false);
+ }
+
+ @Test
+ public void testGitLinkMerging_AddNew_ignoreConflicts() throws Exception {
+ assertGitLinkValue(
+ testGitLink(null, null, LINK_ID3, newIgnoreConflictMerger(),
+ true),
+ LINK_ID3);
+ }
+
+ @Test
+ public void testGitLinkMerging_Delete_ignoreConflicts() throws Exception {
+ assertGitLinkDoesntExist(testGitLink(LINK_ID1, LINK_ID1, null,
+ newIgnoreConflictMerger(), true));
+ }
+
+ @Test
+ public void testGitLinkMerging_UpdateDelete_ignoreConflicts()
+ throws Exception {
+ assertGitLinkValue(testGitLink(LINK_ID1, LINK_ID2, null,
+ newIgnoreConflictMerger(), true), LINK_ID2);
+ }
+
+ @Test
+ public void testGitLinkMerging_DeleteUpdate_ignoreConflicts()
+ throws Exception {
+ assertGitLinkDoesntExist(testGitLink(LINK_ID1, null, LINK_ID3,
+ newIgnoreConflictMerger(), true));
+ }
+
+ @Test
+ public void testGitLinkMerging_UpdateUpdate_ignoreConflicts()
+ throws Exception {
+ assertGitLinkValue(testGitLink(LINK_ID1, LINK_ID2, LINK_ID3,
+ newIgnoreConflictMerger(), true), LINK_ID2);
+ }
+
+ @Test
+ public void testGitLinkMerging_bothAddedSameLink_ignoreConflicts()
+ throws Exception {
+ assertGitLinkValue(testGitLink(null, LINK_ID2, LINK_ID2,
+ newIgnoreConflictMerger(), true), LINK_ID2);
+ }
+
+ @Test
+ public void testGitLinkMerging_bothAddedDifferentLink_ignoreConflicts()
+ throws Exception {
+ assertGitLinkValue(testGitLink(null, LINK_ID2, LINK_ID3,
+ newIgnoreConflictMerger(), true), LINK_ID2);
+ }
+
+ protected Merger testGitLink(@Nullable String baseLink,
+ @Nullable String oursLink, @Nullable String theirsLink,
+ Merger merger, boolean shouldMerge)
+ throws Exception {
+ DirCache treeB = db.readDirCache();
+ DirCache treeO = db.readDirCache();
+ DirCache treeT = db.readDirCache();
+
+ DirCacheBuilder bTreeBuilder = treeB.builder();
+ DirCacheBuilder oTreeBuilder = treeO.builder();
+ DirCacheBuilder tTreeBuilder = treeT.builder();
+
+ maybeAddLink(bTreeBuilder, baseLink);
+ maybeAddLink(oTreeBuilder, oursLink);
+ maybeAddLink(tTreeBuilder, theirsLink);
+
+ 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 });
+
+ boolean merge = merger.merge(new ObjectId[] { o, t });
+ assertEquals(shouldMerge, merge);
+
+ return merger;
+ }
+
+ private Merger newResolveMerger() {
+ return MergeStrategy.RESOLVE.newMerger(db, true);
+ }
+
+ private Merger newIgnoreConflictMerger() {
+ return new ResolveMerger(db, true) {
+ @Override
+ protected boolean mergeImpl() throws IOException {
+ // emulate call with ignore conflicts.
+ return mergeTrees(mergeBase(), sourceTrees[0], sourceTrees[1],
+ true);
+ }
+ };
+ }
+
+ @Test
+ public void testGitLinkMerging_blobWithLink() throws Exception {
+ DirCache treeB = db.readDirCache();
+ DirCache treeO = db.readDirCache();
+ DirCache treeT = db.readDirCache();
+
+ DirCacheBuilder bTreeBuilder = treeB.builder();
+ DirCacheBuilder oTreeBuilder = treeO.builder();
+ DirCacheBuilder tTreeBuilder = treeT.builder();
+
+ bTreeBuilder.add(
+ createEntry(SUBMODULE_PATH, FileMode.REGULAR_FILE, "blob"));
+ oTreeBuilder.add(
+ createEntry(SUBMODULE_PATH, FileMode.REGULAR_FILE, "blob 2"));
+
+ maybeAddLink(tTreeBuilder, LINK_ID3);
+
+ 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 resolveMerger = MergeStrategy.RESOLVE.newMerger(db);
+ boolean merge = resolveMerger.merge(new ObjectId[] { o, t });
+ assertFalse(merge);
+ }
+
+ @Test
+ public void testGitLinkMerging_linkWithBlob() throws Exception {
+ DirCache treeB = db.readDirCache();
+ DirCache treeO = db.readDirCache();
+ DirCache treeT = db.readDirCache();
+
+ DirCacheBuilder bTreeBuilder = treeB.builder();
+ DirCacheBuilder oTreeBuilder = treeO.builder();
+ DirCacheBuilder tTreeBuilder = treeT.builder();
+
+ maybeAddLink(bTreeBuilder, LINK_ID1);
+ maybeAddLink(oTreeBuilder, LINK_ID2);
+ tTreeBuilder.add(
+ createEntry(SUBMODULE_PATH, FileMode.REGULAR_FILE, "blob 3"));
+
+ 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 resolveMerger = MergeStrategy.RESOLVE.newMerger(db);
+ boolean merge = resolveMerger.merge(new ObjectId[] { o, t });
+ assertFalse(merge);
+ }
+
+ @Test
+ public void testGitLinkMerging_linkWithLink() throws Exception {
+ DirCache treeB = db.readDirCache();
+ DirCache treeO = db.readDirCache();
+ DirCache treeT = db.readDirCache();
+
+ DirCacheBuilder bTreeBuilder = treeB.builder();
+ DirCacheBuilder oTreeBuilder = treeO.builder();
+ DirCacheBuilder tTreeBuilder = treeT.builder();
+
+ bTreeBuilder.add(
+ createEntry(SUBMODULE_PATH, FileMode.REGULAR_FILE, "blob"));
+ maybeAddLink(oTreeBuilder, LINK_ID2);
+ maybeAddLink(tTreeBuilder, LINK_ID3);
+
+ 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 resolveMerger = MergeStrategy.RESOLVE.newMerger(db);
+ boolean merge = resolveMerger.merge(new ObjectId[] { o, t });
+ assertFalse(merge);
+ }
+
+ @Test
+ public void testGitLinkMerging_blobWithBlobFromLink() throws Exception {
+ DirCache treeB = db.readDirCache();
+ DirCache treeO = db.readDirCache();
+ DirCache treeT = db.readDirCache();
+
+ DirCacheBuilder bTreeBuilder = treeB.builder();
+ DirCacheBuilder oTreeBuilder = treeO.builder();
+ DirCacheBuilder tTreeBuilder = treeT.builder();
+
+ maybeAddLink(bTreeBuilder, LINK_ID1);
+ oTreeBuilder.add(
+ createEntry(SUBMODULE_PATH, FileMode.REGULAR_FILE, "blob 2"));
+ tTreeBuilder.add(
+ createEntry(SUBMODULE_PATH, FileMode.REGULAR_FILE, "blob 3"));
+
+ 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 resolveMerger = MergeStrategy.RESOLVE.newMerger(db);
+ boolean merge = resolveMerger.merge(new ObjectId[] { o, t });
+ assertFalse(merge);
+ }
+
+ @Test
+ public void testGitLinkMerging_linkBlobDeleted() throws Exception {
+ // We changed a link to a blob, others has deleted this link.
+ DirCache treeB = db.readDirCache();
+ DirCache treeO = db.readDirCache();
+ DirCache treeT = db.readDirCache();
+
+ DirCacheBuilder bTreeBuilder = treeB.builder();
+ DirCacheBuilder oTreeBuilder = treeO.builder();
+ DirCacheBuilder tTreeBuilder = treeT.builder();
+
+ maybeAddLink(bTreeBuilder, LINK_ID1);
+ oTreeBuilder.add(
+ createEntry(SUBMODULE_PATH, FileMode.REGULAR_FILE, "blob 2"));
+
+ 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 resolveMerger = MergeStrategy.RESOLVE.newMerger(db);
+ boolean merge = resolveMerger.merge(new ObjectId[] { o, t });
+ assertFalse(merge);
+ }
+
+ private void maybeAddLink(DirCacheBuilder builder,
+ @Nullable String linkId) {
+ if (linkId == null) {
+ return;
+ }
+ DirCacheEntry newLink = createGitLink(SUBMODULE_PATH,
+ ObjectId.fromString(linkId));
+ builder.add(newLink);
+ }
+
+ private void assertGitLinkValue(Merger resolveMerger, String expectedValue)
+ throws Exception {
+ try (TreeWalk tw = new TreeWalk(db)) {
+ tw.setRecursive(true);
+ tw.reset(resolveMerger.getResultTreeId());
+
+ assertTrue(tw.next());
+ assertEquals(SUBMODULE_PATH, tw.getPathString());
+ assertEquals(ObjectId.fromString(expectedValue), tw.getObjectId(0));
+
+ assertFalse(tw.next());
+ }
+ }
+
+ private void assertGitLinkDoesntExist(Merger resolveMerger)
+ throws Exception {
+ try (TreeWalk tw = new TreeWalk(db)) {
+ tw.setRecursive(true);
+ tw.reset(resolveMerger.getResultTreeId());
+
+ assertFalse(tw.next());
+ }
+ }
+
+ 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());
+ c.setParentIds(parentIds);
+ c.setMessage("Tree " + c.getTreeId().name());
+ ObjectId id = odi.insert(c);
+ odi.flush();
+ return id;
+ }
+}
diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index 10d0de0..ec74460 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.9.0.qualifier
+Bundle-Version: 5.10.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-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)"
+Export-Package: org.eclipse.jgit.awtui;version="5.10.0"
+Import-Package: org.eclipse.jgit.errors;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.lib;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.nls;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revplot;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.transport;version="[5.10.0,5.11.0)",
+ org.eclipse.jgit.util;version="[5.10.0,5.11.0)"
diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF
index e3f611f..b2e8c25 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.9.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.9.0.qualifier";roots="."
+Bundle-Version: 5.10.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.10.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml
index 717e74e..56b22d6 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.9.0-SNAPSHOT</version>
+ <version>5.10.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 617292b..433a193 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.9.0.qualifier
+Bundle-Version: 5.10.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Eclipse-ExtensibleAPI: true
-Export-Package: org.eclipse.jgit.annotations;version="5.9.0",
- org.eclipse.jgit.api;version="5.9.0";
+Export-Package: org.eclipse.jgit.annotations;version="5.10.0",
+ org.eclipse.jgit.api;version="5.10.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.9.0";
+ org.eclipse.jgit.api.errors;version="5.10.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.errors",
- org.eclipse.jgit.attributes;version="5.9.0";
+ org.eclipse.jgit.attributes;version="5.10.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk",
- org.eclipse.jgit.blame;version="5.9.0";
+ org.eclipse.jgit.blame;version="5.10.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.9.0";
+ org.eclipse.jgit.diff;version="5.10.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.9.0";
+ org.eclipse.jgit.dircache;version="5.10.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.9.0";
+ org.eclipse.jgit.errors;version="5.10.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.9.0";
+ org.eclipse.jgit.events;version="5.10.0";
uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.fnmatch;version="5.9.0",
- org.eclipse.jgit.gitrepo;version="5.9.0";
+ org.eclipse.jgit.fnmatch;version="5.10.0",
+ org.eclipse.jgit.gitrepo;version="5.10.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.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";
+ org.eclipse.jgit.gitrepo.internal;version="5.10.0";x-internal:=true,
+ org.eclipse.jgit.hooks;version="5.10.0";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.ignore;version="5.10.0",
+ org.eclipse.jgit.ignore.internal;version="5.10.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal;version="5.9.0";
+ org.eclipse.jgit.internal;version="5.10.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.http.test",
- org.eclipse.jgit.internal.fsck;version="5.9.0";
+ org.eclipse.jgit.internal.fsck;version="5.10.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.ketch;version="5.9.0";
+ org.eclipse.jgit.internal.ketch;version="5.10.0";
x-friends:="org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.revwalk;version="5.9.0";x-internal:=true,
- org.eclipse.jgit.internal.storage.dfs;version="5.9.0";
+ org.eclipse.jgit.internal.revwalk;version="5.10.0";x-internal:=true,
+ org.eclipse.jgit.internal.storage.dfs;version="5.10.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.9.0";
+ org.eclipse.jgit.internal.storage.file;version="5.10.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.9.0";
+ org.eclipse.jgit.internal.storage.io;version="5.10.0";
x-friends:="org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.pack;version="5.9.0";
+ org.eclipse.jgit.internal.storage.pack;version="5.10.0";
x-friends:="org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.reftable;version="5.9.0";
+ org.eclipse.jgit.internal.storage.reftable;version="5.10.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.9.0";
+ org.eclipse.jgit.internal.storage.reftree;version="5.10.0";
x-friends:="org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.submodule;version="5.9.0";x-internal:=true,
- org.eclipse.jgit.internal.transport.connectivity;version="5.9.0";
+ org.eclipse.jgit.internal.submodule;version="5.10.0";x-internal:=true,
+ org.eclipse.jgit.internal.transport.connectivity;version="5.10.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.http;version="5.9.0";
+ org.eclipse.jgit.internal.transport.http;version="5.10.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.parser;version="5.9.0";
+ org.eclipse.jgit.internal.transport.parser;version="5.10.0";
x-friends:="org.eclipse.jgit.http.server,
org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.ssh;version="5.9.0";
+ org.eclipse.jgit.internal.transport.ssh;version="5.10.0";
x-friends:="org.eclipse.jgit.ssh.apache,
org.eclipse.jgit.ssh.jsch",
- org.eclipse.jgit.lib;version="5.9.0";
+ org.eclipse.jgit.lib;version="5.10.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.9.0";
+ org.eclipse.jgit.lib.internal;version="5.10.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.merge;version="5.9.0";
+ org.eclipse.jgit.merge;version="5.10.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.9.0",
- org.eclipse.jgit.notes;version="5.9.0";
+ org.eclipse.jgit.nls;version="5.10.0",
+ org.eclipse.jgit.notes;version="5.10.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.merge",
- org.eclipse.jgit.patch;version="5.9.0";
+ org.eclipse.jgit.patch;version="5.10.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.diff",
- org.eclipse.jgit.revplot;version="5.9.0";
+ org.eclipse.jgit.revplot;version="5.10.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk",
- org.eclipse.jgit.revwalk;version="5.9.0";
+ org.eclipse.jgit.revwalk;version="5.10.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.9.0";
+ org.eclipse.jgit.revwalk.filter;version="5.10.0";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.lib,
org.eclipse.jgit.util",
- org.eclipse.jgit.storage.file;version="5.9.0";
+ org.eclipse.jgit.storage.file;version="5.10.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.util",
- org.eclipse.jgit.storage.pack;version="5.9.0";
+ org.eclipse.jgit.storage.pack;version="5.10.0";
uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.submodule;version="5.9.0";
+ org.eclipse.jgit.submodule;version="5.10.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.9.0";
+ org.eclipse.jgit.transport;version="5.10.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.9.0";
+ org.eclipse.jgit.transport.http;version="5.10.0";
uses:="javax.net.ssl",
- org.eclipse.jgit.transport.resolver;version="5.9.0";
+ org.eclipse.jgit.transport.resolver;version="5.10.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.lib",
- org.eclipse.jgit.treewalk;version="5.9.0";
+ org.eclipse.jgit.treewalk;version="5.10.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.9.0";
+ org.eclipse.jgit.treewalk.filter;version="5.10.0";
uses:="org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util;version="5.9.0";
+ org.eclipse.jgit.util;version="5.10.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.9.0";
+ org.eclipse.jgit.util.io;version="5.10.0";
uses:="org.eclipse.jgit.attributes,
org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util.sha1;version="5.9.0",
- org.eclipse.jgit.util.time;version="5.9.0"
+ org.eclipse.jgit.util.sha1;version="5.10.0",
+ org.eclipse.jgit.util.time;version="5.10.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 d248971..97dbca5 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.9.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit;version="5.9.0.qualifier";roots="."
+Bundle-Version: 5.10.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit;version="5.10.0.qualifier";roots="."
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index d891434..1d2aac0 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.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit</artifactId>
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBundleWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBundleWriter.java
new file mode 100644
index 0000000..736f381
--- /dev/null
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBundleWriter.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2020, Google LLC and others
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Distribution License v. 1.0 which is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+package org.eclipse.jgit.internal.storage.dfs;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jgit.internal.storage.pack.CachedPack;
+import org.eclipse.jgit.lib.ProgressMonitor;
+import org.eclipse.jgit.transport.BundleWriter;
+
+/** Writes {@link DfsRepository} to a Git bundle. */
+public class DfsBundleWriter {
+ /**
+ * Writes the entire {@link DfsRepository} to a Git bundle.
+ * <p>
+ * This method try to avoid traversing the pack files as much as possible
+ * and dumps all objects as-is to a Git bundle.
+ *
+ * @param pm
+ * progress monitor
+ * @param os
+ * Git bundle output
+ * @param db
+ * repository
+ * @throws IOException
+ * thrown if the output stream throws one.
+ */
+ public static void writeEntireRepositoryAsBundle(ProgressMonitor pm,
+ OutputStream os, DfsRepository db) throws IOException {
+ BundleWriter bw = new BundleWriter(db);
+ db.getRefDatabase().getRefs().forEach(bw::include);
+ List<CachedPack> packs = new ArrayList<>();
+ for (DfsPackFile p : db.getObjectDatabase().getPacks()) {
+ packs.add(new DfsCachedPack(p));
+ }
+ bw.addObjectsAsIs(packs);
+ bw.writeBundle(pm, os);
+ }
+
+ private DfsBundleWriter() {
+ }
+}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
index 9e40949..3e4b5df 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
@@ -756,6 +756,19 @@
/**
* Prepare the list of objects to be written to the pack stream.
+ *
+ * <p>
+ * PackWriter will concat and write out the specified packs as-is.
+ *
+ * @param c
+ * cached packs to be written.
+ */
+ public void preparePack(Collection<? extends CachedPack> c) {
+ cachedPacks.addAll(c);
+ }
+
+ /**
+ * Prepare the list of objects to be written to the pack stream.
* <p>
* Basing on these 2 sets, another set of objects to put in a pack file is
* created: this set consists of all objects reachable (ancestors) from
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
index 506d333..6c217fd 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -588,7 +588,8 @@
final int modeO = tw.getRawMode(T_OURS);
final int modeT = tw.getRawMode(T_THEIRS);
final int modeB = tw.getRawMode(T_BASE);
-
+ boolean gitLinkMerging = isGitLink(modeO) || isGitLink(modeT)
+ || isGitLink(modeB);
if (modeO == 0 && modeT == 0 && modeB == 0)
// File is either untracked or new, staged but uncommitted
return true;
@@ -737,31 +738,28 @@
return false;
}
- boolean gitlinkConflict = isGitLink(modeO) || isGitLink(modeT);
- // Don't attempt to resolve submodule link conflicts
- if (gitlinkConflict || !attributes.canBeContentMerged()) {
+ if (gitLinkMerging && ignoreConflicts) {
+ // Always select 'ours' in case of GITLINK merge failures so
+ // a caller can use virtual commit.
+ add(tw.getRawPath(), ours, DirCacheEntry.STAGE_0, EPOCH, 0);
+ return true;
+ } else if (gitLinkMerging) {
+ add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0);
+ add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0);
+ add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0);
+ MergeResult<SubmoduleConflict> result = createGitLinksMergeResult(
+ base, ours, theirs);
+ result.setContainsConflicts(true);
+ mergeResults.put(tw.getPathString(), result);
+ unmergedPaths.add(tw.getPathString());
+ return true;
+ } else if (!attributes.canBeContentMerged()) {
add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0);
add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0);
add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0);
- if (gitlinkConflict) {
- MergeResult<SubmoduleConflict> result = new MergeResult<>(
- Arrays.asList(
- new SubmoduleConflict(base == null ? null
- : base.getEntryObjectId()),
- new SubmoduleConflict(ours == null ? null
- : ours.getEntryObjectId()),
- new SubmoduleConflict(theirs == null ? null
- : theirs.getEntryObjectId())));
- result.setContainsConflicts(true);
- mergeResults.put(tw.getPathString(), result);
- if (!ignoreConflicts) {
- unmergedPaths.add(tw.getPathString());
- }
- } else {
- // attribute merge issues are conflicts but not failures
- unmergedPaths.add(tw.getPathString());
- }
+ // attribute merge issues are conflicts but not failures
+ unmergedPaths.add(tw.getPathString());
return true;
}
@@ -786,45 +784,73 @@
// OURS or THEIRS has been deleted
if (((modeO != 0 && !tw.idEqual(T_BASE, T_OURS)) || (modeT != 0 && !tw
.idEqual(T_BASE, T_THEIRS)))) {
- MergeResult<RawText> result = contentMerge(base, ours, theirs,
- attributes);
-
- if (ignoreConflicts) {
- // In case a conflict is detected the working tree file is
- // again filled with new content (containing conflict
- // markers). But also stage 0 of the index is filled with
- // that content.
- result.setContainsConflicts(false);
- updateIndex(base, ours, theirs, result, attributes);
- } else {
+ if (gitLinkMerging && ignoreConflicts) {
+ add(tw.getRawPath(), ours, DirCacheEntry.STAGE_0, EPOCH, 0);
+ } else if (gitLinkMerging) {
add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0);
add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0);
- DirCacheEntry e = add(tw.getRawPath(), theirs,
- DirCacheEntry.STAGE_3, EPOCH, 0);
+ add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0);
+ MergeResult<SubmoduleConflict> result = createGitLinksMergeResult(
+ base, ours, theirs);
+ result.setContainsConflicts(true);
+ mergeResults.put(tw.getPathString(), result);
+ unmergedPaths.add(tw.getPathString());
+ } else {
+ MergeResult<RawText> result = contentMerge(base, ours,
+ theirs, attributes);
- // OURS was deleted checkout THEIRS
- if (modeO == 0) {
- // Check worktree before checking out THEIRS
- if (isWorktreeDirty(work, ourDce)) {
- return false;
- }
- if (nonTree(modeT)) {
- if (e != null) {
- addToCheckout(tw.getPathString(), e, attributes);
+ if (ignoreConflicts) {
+ // In case a conflict is detected the working tree file
+ // is again filled with new content (containing conflict
+ // markers). But also stage 0 of the index is filled
+ // with that content.
+ result.setContainsConflicts(false);
+ updateIndex(base, ours, theirs, result, attributes);
+ } else {
+ add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH,
+ 0);
+ add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH,
+ 0);
+ DirCacheEntry e = add(tw.getRawPath(), theirs,
+ DirCacheEntry.STAGE_3, EPOCH, 0);
+
+ // OURS was deleted checkout THEIRS
+ if (modeO == 0) {
+ // Check worktree before checking out THEIRS
+ if (isWorktreeDirty(work, ourDce)) {
+ return false;
+ }
+ if (nonTree(modeT)) {
+ if (e != null) {
+ addToCheckout(tw.getPathString(), e,
+ attributes);
+ }
}
}
+
+ unmergedPaths.add(tw.getPathString());
+
+ // generate a MergeResult for the deleted file
+ mergeResults.put(tw.getPathString(), result);
}
-
- unmergedPaths.add(tw.getPathString());
-
- // generate a MergeResult for the deleted file
- mergeResults.put(tw.getPathString(), result);
}
}
}
return true;
}
+ private static MergeResult<SubmoduleConflict> createGitLinksMergeResult(
+ CanonicalTreeParser base, CanonicalTreeParser ours,
+ CanonicalTreeParser theirs) {
+ return new MergeResult<>(Arrays.asList(
+ new SubmoduleConflict(
+ base == null ? null : base.getEntryObjectId()),
+ new SubmoduleConflict(
+ ours == null ? null : ours.getEntryObjectId()),
+ new SubmoduleConflict(
+ theirs == null ? null : theirs.getEntryObjectId())));
+ }
+
/**
* Does the content merge. The three texts base, ours and theirs are
* specified with {@link CanonicalTreeParser}. If any of the parsers is
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java
index 57eed3a..e1aa9d7 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java
@@ -17,12 +17,16 @@
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import org.eclipse.jgit.internal.JGitText;
+import org.eclipse.jgit.internal.storage.pack.CachedPack;
import org.eclipse.jgit.internal.storage.pack.PackWriter;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.Constants;
@@ -62,6 +66,8 @@
private final Set<ObjectId> tagTargets;
+ private final List<CachedPack> cachedPacks = new ArrayList<>();
+
private PackConfig packConfig;
private ObjectCountCallback callback;
@@ -150,6 +156,25 @@
}
/**
+ * Add objects to the bundle file.
+ *
+ * <p>
+ * When this method is used, object traversal is disabled and specified pack
+ * files are directly saved to the Git bundle file.
+ *
+ * <p>
+ * Unlike {@link #include}, this doesn't affect the refs. Even if the
+ * objects are not reachable from any ref, they will be included in the
+ * bundle file.
+ *
+ * @param c
+ * pack to include
+ */
+ public void addObjectsAsIs(Collection<? extends CachedPack> c) {
+ cachedPacks.addAll(c);
+ }
+
+ /**
* Assume a commit is available on the recipient's side.
* <p>
* In order to fetch from a bundle the recipient must have any assumed
@@ -187,19 +212,24 @@
try (PackWriter packWriter = newPackWriter()) {
packWriter.setObjectCountCallback(callback);
- final HashSet<ObjectId> inc = new HashSet<>();
- final HashSet<ObjectId> exc = new HashSet<>();
- inc.addAll(include.values());
- for (RevCommit r : assume)
- exc.add(r.getId());
packWriter.setIndexDisabled(true);
packWriter.setDeltaBaseAsOffset(true);
- packWriter.setThin(!exc.isEmpty());
packWriter.setReuseValidatingObjects(false);
- if (exc.isEmpty()) {
- packWriter.setTagTargets(tagTargets);
+ if (cachedPacks.isEmpty()) {
+ HashSet<ObjectId> inc = new HashSet<>();
+ HashSet<ObjectId> exc = new HashSet<>();
+ inc.addAll(include.values());
+ for (RevCommit r : assume) {
+ exc.add(r.getId());
+ }
+ if (exc.isEmpty()) {
+ packWriter.setTagTargets(tagTargets);
+ }
+ packWriter.setThin(!exc.isEmpty());
+ packWriter.preparePack(monitor, inc, exc);
+ } else {
+ packWriter.preparePack(cachedPacks);
}
- packWriter.preparePack(monitor, inc, exc);
final Writer w = new OutputStreamWriter(os, UTF_8);
w.write(TransportBundle.V2_BUNDLE_SIGNATURE);
diff --git a/pom.xml b/pom.xml
index e158809..b6d5c00 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.9.0-SNAPSHOT</version>
+ <version>5.10.0-SNAPSHOT</version>
<name>JGit - Parent</name>
<url>${jgit-url}</url>
