Merge branch 'stable-5.5'
* stable-5.5:
bazel: fix running http tests
Set parameter name in parameterized http tests
Format BUILD files with buildifier
Format BUILD files with buildifier
[error prone] Suppress NonAtomicVolatileUpdate in SimpleLruCache
Bazel: Format BUILD files with buildifier
Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
Bazel: Fix warning about deprecated lib.bzl
Format lib/BUILD with buildifier
Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
Bazel: Bump minimum supported version to 0.29.0
Bazel: Bump skylib library version to 0.8.0
Use bazelisk to switch between used bazel version
Bazel: Require minimum bazel version 0.17.1
Fix wrong placeholder index in error message packInaccessible
JGitText: Remove unused externalized strings
RepoText: Remove unused externalized string
CLI: Remove unused externalized strings
Change-Id: Idb0848dd33a76328b24908dc86db335cca742a1c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index 6603455..bfa7861 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.5.0.qualifier
+Bundle-Version: 5.6.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.ant.tasks;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.junit;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)",
+ org.eclipse.jgit.ant.tasks;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.12,5.0.0)"
diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml
index 873f3a7..6935af8 100644
--- a/org.eclipse.jgit.ant.test/pom.xml
+++ b/org.eclipse.jgit.ant.test/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 41a0422..fbce458 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.5.0.qualifier
+Bundle-Version: 5.6.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.storage.file;version="[5.5.0,5.6.0)"
+ org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)"
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.ant;version="5.5.0",
- org.eclipse.jgit.ant.tasks;version="5.5.0";
+Export-Package: org.eclipse.jgit.ant;version="5.6.0",
+ org.eclipse.jgit.ant.tasks;version="5.6.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 708d297..80c658e 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.5.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.5.0.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.6.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml
index e97d18d..8d9b1e3 100644
--- a/org.eclipse.jgit.ant/pom.xml
+++ b/org.eclipse.jgit.ant/pom.xml
@@ -48,7 +48,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 965c798..956d243 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.5.0.qualifier
+Bundle-Version: 5.6.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.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)",
+ org.eclipse.jgit.api;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.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.5.0";
+Export-Package: org.eclipse.jgit.archive;version="5.6.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.5.0";x-internal:=true
+ org.eclipse.jgit.archive.internal;version="5.6.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 be1bc5d..c0b9670 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.5.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.5.0.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.6.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml
index bc80fa7..65a1f52 100644
--- a/org.eclipse.jgit.archive/pom.xml
+++ b/org.eclipse.jgit.archive/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.archive</artifactId>
diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml
index 2134c7f..9dfb251 100644
--- a/org.eclipse.jgit.coverage/pom.xml
+++ b/org.eclipse.jgit.coverage/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -18,88 +18,88 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ant</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.archive</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.apache</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.server</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.server</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ui</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.test</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ant.test</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.test</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm.test</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.test</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.server.test</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
index 5c95636..ff97910 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.5.0.qualifier
+Bundle-Version: 5.6.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
@@ -23,11 +23,11 @@
org.apache.http.impl.client;version="[4.3.0,5.0.0)",
org.apache.http.impl.conn;version="[4.3.0,5.0.0)",
org.apache.http.params;version="[4.3.0,5.0.0)",
- org.eclipse.jgit.annotations;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.http;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)"
-Export-Package: org.eclipse.jgit.transport.http.apache;version="5.5.0";
+ org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)"
+Export-Package: org.eclipse.jgit.transport.http.apache;version="5.6.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 ad279f8..8950164 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.5.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.5.0.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.6.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml
index 69ab575..4be8a98 100644
--- a/org.eclipse.jgit.http.apache/pom.xml
+++ b/org.eclipse.jgit.http.apache/pom.xml
@@ -48,7 +48,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 0a7fa84..d4ce149 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.5.0.qualifier
+Bundle-Version: 5.6.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.http.server;version="5.5.0",
- org.eclipse.jgit.http.server.glue;version="5.5.0";
+Export-Package: org.eclipse.jgit.http.server;version="5.6.0",
+ org.eclipse.jgit.http.server.glue;version="5.6.0";
uses:="javax.servlet,javax.servlet.http",
- org.eclipse.jgit.http.server.resolver;version="5.5.0";
+ org.eclipse.jgit.http.server.resolver;version="5.6.0";
uses:="org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.lib,
org.eclipse.jgit.transport,
@@ -18,13 +18,13 @@
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.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.transport.parser;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.resolver;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)"
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.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 0fbcd98..e051fd8 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.5.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.5.0.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.6.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index 4ccdb91..97d90d0 100644
--- a/org.eclipse.jgit.http.server/pom.xml
+++ b/org.eclipse.jgit.http.server/pom.xml
@@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 a3afc0d..97f1105 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.5.0.qualifier
+Bundle-Version: 5.6.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.5.0,5.6.0)",
- org.eclipse.jgit.http.server;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.http.server.glue;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.http.server.resolver;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.junit;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.junit.http;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.http;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.resolver;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)",
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.http.server;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.http.server.glue;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.http.server.resolver;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
org.hamcrest;version="[1.1.0,2.0.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.12,5.0.0)",
diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml
index 020039d..e055c58 100644
--- a/org.eclipse.jgit.http.test/pom.xml
+++ b/org.eclipse.jgit.http.test/pom.xml
@@ -51,7 +51,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 2d97d26..5806277 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.5.0.qualifier
+Bundle-Version: 5.6.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.5.0,5.6.0)",
- org.eclipse.jgit.http.server;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.junit;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.resolver;version="[5.5.0,5.6.0)",
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.http.server;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.6.0,5.7.0)",
org.junit;version="[4.12,5.0.0)"
-Export-Package: org.eclipse.jgit.junit.http;version="5.5.0";
+Export-Package: org.eclipse.jgit.junit.http;version="5.6.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 1bf4a31..b454cd0 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.5.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.5.0.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.6.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml
index 7cdae3a..c69f194 100644
--- a/org.eclipse.jgit.junit.http/pom.xml
+++ b/org.eclipse.jgit.junit.http/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 67e8c63..7ece760 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.5.0.qualifier
+Bundle-Version: 5.6.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
@@ -30,8 +30,8 @@
org.apache.sshd.server.shell;version="[2.2.0,2.3.0)",
org.apache.sshd.server.subsystem;version="[2.2.0,2.3.0)",
org.apache.sshd.server.subsystem.sftp;version="[2.2.0,2.3.0)",
- org.eclipse.jgit.annotations;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.0,5.6.0)",
+ org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit.ssh;version="5.5.0"
+Export-Package: org.eclipse.jgit.junit.ssh;version="5.6.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 1890ab5..2438c00 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.5.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.5.0.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.6.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml
index 50e666c..d4591d7 100644
--- a/org.eclipse.jgit.junit.ssh/pom.xml
+++ b/org.eclipse.jgit.junit.ssh/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 e2a186c..aedfaa9 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.5.0.qualifier
+Bundle-Version: 5.6.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.5.0,5.6.0)",
- org.eclipse.jgit.api;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.api.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.dircache;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.merge;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport;version="5.5.0",
- org.eclipse.jgit.treewalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util.io;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util.time;version="[5.5.0,5.6.0)",
+Import-Package: org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.api;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.dircache;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.merge;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="5.6.0",
+ org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util.io;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util.time;version="[5.6.0,5.7.0)",
org.junit;version="[4.12,5.0.0)",
org.junit.rules;version="[4.12,5.0.0)",
org.junit.runner;version="[4.12,5.0.0)",
org.junit.runners;version="[4.12,5.0.0)",
org.junit.runners.model;version="[4.12,5.0.0)",
org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit;version="5.5.0";
+Export-Package: org.eclipse.jgit.junit;version="5.6.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.5.0";uses:="org.eclipse.jgit.util.time"
+ org.eclipse.jgit.junit.time;version="5.6.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 ff15a73..d9a24d8 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.5.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.5.0.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.6.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml
index ed0a82c..af0a7f1 100644
--- a/org.eclipse.jgit.junit/pom.xml
+++ b/org.eclipse.jgit.junit/pom.xml
@@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit</artifactId>
diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
index 237b732..4279a4a 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.5.0.qualifier
+Bundle-Version: 5.6.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.5.0,5.6.0)",
- org.eclipse.jgit.api.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.junit;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.junit.http;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs.server;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs.server.fs;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs.test;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.treewalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)",
+ org.eclipse.jgit.api;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.server;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.test;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.12,5.0.0)",
org.junit.rules;version="[4.12,5.0.0)",
diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml
index d6075fe..6fb9b78 100644
--- a/org.eclipse.jgit.lfs.server.test/pom.xml
+++ b/org.eclipse.jgit.lfs.server.test/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 e130a8d..fb0ee06 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.5.0.qualifier
+Bundle-Version: 5.6.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs.server;version="5.5.0";
+Export-Package: org.eclipse.jgit.lfs.server;version="5.6.0";
uses:="javax.servlet.http,
org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.fs;version="5.5.0";
+ org.eclipse.jgit.lfs.server.fs;version="5.6.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.5.0";x-internal:=true,
- org.eclipse.jgit.lfs.server.s3;version="5.5.0";
+ org.eclipse.jgit.lfs.server.internal;version="5.6.0";x-internal:=true,
+ org.eclipse.jgit.lfs.server.s3;version="5.6.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.5.0,5.6.0)",
- org.eclipse.jgit.internal;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs.internal;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.http;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)",
+ org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.internal;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.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 916329a..6f1c3a4 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.5.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.5.0.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.6.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml
index a00d2b9..b95806b 100644
--- a/org.eclipse.jgit.lfs.server/pom.xml
+++ b/org.eclipse.jgit.lfs.server/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 c8b48d6..549a0ff 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.5.0.qualifier
+Bundle-Version: 5.6.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.junit;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.treewalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)",
+Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.12,5.0.0)",
org.junit.runner;version="[4.12,5.0.0)",
org.junit.runners;version="[4.12,5.0.0)"
-Export-Package: org.eclipse.jgit.lfs.test;version="5.5.0";x-friends:="org.eclipse.jgit.lfs.server.test"
+Export-Package: org.eclipse.jgit.lfs.test;version="5.6.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 ea1b6d5..d1691c3 100644
--- a/org.eclipse.jgit.lfs.test/pom.xml
+++ b/org.eclipse.jgit.lfs.test/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.test</artifactId>
diff --git a/org.eclipse.jgit.lfs/.settings/.api_filters b/org.eclipse.jgit.lfs/.settings/.api_filters
deleted file mode 100644
index 9747df8..0000000
--- a/org.eclipse.jgit.lfs/.settings/.api_filters
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.jgit.lfs" version="2">
- <resource path="src/org/eclipse/jgit/lfs/lib/AnyLongObjectId.java" type="org.eclipse.jgit.lfs.lib.AnyLongObjectId">
- <filter id="1141899266">
- <message_arguments>
- <message_argument value="5.4"/>
- <message_argument value="5.5"/>
- <message_argument value="isEqual(AnyLongObjectId, AnyLongObjectId)"/>
- </message_arguments>
- </filter>
- </resource>
-</component>
diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
index ce2cc58..1fd1957 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.5.0.qualifier
+Bundle-Version: 5.6.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs;version="5.5.0",
- org.eclipse.jgit.lfs.errors;version="5.5.0",
- org.eclipse.jgit.lfs.internal;version="5.5.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.5.0"
+Export-Package: org.eclipse.jgit.lfs;version="5.6.0",
+ org.eclipse.jgit.lfs.errors;version="5.6.0",
+ org.eclipse.jgit.lfs.internal;version="5.6.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.6.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.5.0,5.6.0)";resolution:=optional,
- org.eclipse.jgit.api.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.attributes;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.diff;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.hooks;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.storage.pack;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.http;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.treewalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util.io;version="[5.5.0,5.6.0)"
+ org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)";resolution:=optional,
+ org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.attributes;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.diff;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.hooks;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.pack;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util.io;version="[5.6.0,5.7.0)"
diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
index d401066..382d156 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.5.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.5.0.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.6.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml
index d299479..f1df7a0 100644
--- a/org.eclipse.jgit.lfs/pom.xml
+++ b/org.eclipse.jgit.lfs/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 8861ff0..fb36ac0 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.5.0.qualifier"
+ version="5.6.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 e4d107f..0cbe270 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 ece4cb8..de604cd 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.5.0.qualifier"
+ version="5.6.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.5.0" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="5.6.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 72f7253..81e69d2 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
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 7ed1c25..4604b4f 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.5.0.qualifier"
+ version="5.6.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.5.0" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="5.6.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 004de58..5d07fa4 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
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 b688612..1b2897d 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.5.0.qualifier"
+ version="5.6.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.5.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.6.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 bf14a8b..0a82897 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
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 748996e..dd662c9 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.5.0.qualifier"
+ version="5.6.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.5.0" match="equivalent"/>
- <import feature="org.eclipse.jgit.lfs" version="5.5.0" match="equivalent"/>
- <import feature="org.eclipse.jgit.ssh.apache" version="5.5.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.6.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit.lfs" version="5.6.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit.ssh.apache" version="5.6.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 6d61c40..504c1a8 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
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 d66bac6..8f21d1d 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 b76f685..d4828e4 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.5.0.qualifier"
+ version="5.6.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.5.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.6.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 9fe2854..933cc8f 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
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.eclipse.jgit.feature</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 93f41dd..2582a77 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.5.0.qualifier"
+ version="5.6.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.5.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="5.6.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 2c1de89..6fa69ea 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
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 b17ee5e..068c15d 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.5.0.qualifier
+Bundle-Version: 5.6.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 44355f0..e8d9df0 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
@@ -49,7 +49,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 1e17c9d..68295a0 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -49,7 +49,7 @@
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 4f74752..fc36051 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.5.0.qualifier
+Bundle-Version: 5.6.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.5.0,5.6.0)",
- org.eclipse.jgit.api.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.diff;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.dircache;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="5.5.0",
- org.eclipse.jgit.junit;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.merge;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.pgm;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.pgm.internal;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.pgm.opt;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.treewalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util.io;version="[5.5.0,5.6.0)",
+Import-Package: org.eclipse.jgit.api;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.diff;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.dircache;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="5.6.0",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.merge;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.pgm;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.pgm.internal;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.pgm.opt;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util.io;version="[5.6.0,5.7.0)",
org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
org.junit;version="[4.12,5.0.0)",
org.junit.rules;version="[4.12,5.0.0)",
diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml
index 1d1c03b..1ba893c 100644
--- a/org.eclipse.jgit.pgm.test/pom.xml
+++ b/org.eclipse.jgit.pgm.test/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 14a14b2..48dc730 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.5.0.qualifier
+Bundle-Version: 5.6.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
@@ -28,50 +28,50 @@
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.5.0,5.6.0)",
- org.eclipse.jgit.api.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.archive;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.awtui;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.blame;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.diff;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.dircache;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.gitrepo;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.ketch;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.io;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.reftree;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs.server;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs.server.fs;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs.server.s3;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.merge;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.notes;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revplot;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.storage.pack;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.resolver;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.sshd;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.treewalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util.io;version="[5.5.0,5.6.0)",
+ org.eclipse.jgit.api;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.archive;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.awtui;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.blame;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.diff;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.dircache;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.gitrepo;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.ketch;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.io;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.reftree;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.server;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs.server.s3;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.merge;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.notes;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revplot;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.pack;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http.apache;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.sshd;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util.io;version="[5.6.0,5.7.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.5.0";
+Export-Package: org.eclipse.jgit.console;version="5.6.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util",
- org.eclipse.jgit.pgm;version="5.5.0";
+ org.eclipse.jgit.pgm;version="5.6.0";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.pgm.opt,
@@ -82,11 +82,11 @@
org.eclipse.jgit.treewalk,
javax.swing,
org.eclipse.jgit.transport",
- org.eclipse.jgit.pgm.debug;version="5.5.0";
+ org.eclipse.jgit.pgm.debug;version="5.6.0";
uses:="org.eclipse.jgit.util.io,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.pgm.internal;version="5.5.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test",
- org.eclipse.jgit.pgm.opt;version="5.5.0";
+ org.eclipse.jgit.pgm.internal;version="5.6.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test",
+ org.eclipse.jgit.pgm.opt;version="5.6.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.kohsuke.args4j.spi,
diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
index d5323ba..70aa500 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.5.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.5.0.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.6.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index c6af997..003076f 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.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 d0383b8..4bae3d9 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.5.0.qualifier
+Bundle-Version: 5.6.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -15,15 +15,15 @@
org.apache.sshd.common.session;version="[2.2.0,2.3.0)",
org.apache.sshd.common.util.net;version="[2.2.0,2.3.0)",
org.apache.sshd.common.util.security;version="[2.2.0,2.3.0)",
- org.eclipse.jgit.api.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.junit;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.junit.ssh;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.ssh;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.sshd;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)",
+ org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit.ssh;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.ssh;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.sshd;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
org.junit;version="[4.12,5.0.0)",
org.junit.experimental.theories;version="[4.12,5.0.0)",
org.junit.runner;version="[4.12,5.0.0)"
diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml
index 23d6f8f..838fd83 100644
--- a/org.eclipse.jgit.ssh.apache.test/pom.xml
+++ b/org.eclipse.jgit.ssh.apache.test/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
diff --git a/org.eclipse.jgit.ssh.apache/.settings/.api_filters b/org.eclipse.jgit.ssh.apache/.settings/.api_filters
new file mode 100644
index 0000000..a0e4695
--- /dev/null
+++ b/org.eclipse.jgit.ssh.apache/.settings/.api_filters
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.jgit.ssh.apache" version="2">
+ <resource path="src/org/eclipse/jgit/transport/sshd/ServerKeyDatabase.java" type="org.eclipse.jgit.transport.sshd.ServerKeyDatabase">
+ <filter id="1108344834">
+ <message_arguments>
+ <message_argument value="5.5"/>
+ <message_argument value="5.6"/>
+ <message_argument value="org.eclipse.jgit.transport.sshd.ServerKeyDatabase"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/jgit/transport/sshd/SshdSessionFactory.java" type="org.eclipse.jgit.transport.sshd.SshdSessionFactory">
+ <filter id="1141899266">
+ <message_arguments>
+ <message_argument value="5.5"/>
+ <message_argument value="5.6"/>
+ <message_argument value="getServerKeyDatabase(File, File)"/>
+ </message_arguments>
+ </filter>
+ <filter id="1141899266">
+ <message_arguments>
+ <message_argument value="5.5"/>
+ <message_argument value="5.6"/>
+ <message_argument value="getSshConfig(File)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index e9f5302..209a10f 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.5.0.qualifier
+Bundle-Version: 5.6.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.5.0";x-internal:=true;
+Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.6.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.5.0";x-internal:=true,
- org.eclipse.jgit.internal.transport.sshd.proxy;version="5.5.0";x-friends:="org.eclipse.jgit.ssh.apache.test",
- org.eclipse.jgit.transport.sshd;version="5.5.0";
+ org.eclipse.jgit.internal.transport.sshd.auth;version="5.6.0";x-internal:=true,
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="5.6.0";x-friends:="org.eclipse.jgit.ssh.apache.test",
+ org.eclipse.jgit.transport.sshd;version="5.6.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.2.0,2.3.0)",
org.apache.sshd.common.util.security;version="[2.2.0,2.3.0)",
org.apache.sshd.server.auth;version="[2.2.0,2.3.0)",
- org.eclipse.jgit.annotations;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.fnmatch;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)",
+ org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.fnmatch;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.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 4e69a1d..c1d8d9a 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.5.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.5.0.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.6.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml
index 9ec2f61..26e44b0 100644
--- a/org.eclipse.jgit.ssh.apache/pom.xml
+++ b/org.eclipse.jgit.ssh.apache/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index e36f5e4..8d240d3 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.5.0.qualifier
+Bundle-Version: 5.6.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
@@ -18,57 +18,57 @@
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.bouncycastle.util.encoders;version="[1.61.0,2.0.0)",
- org.eclipse.jgit.annotations;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.api;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.api.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.archive;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.attributes;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.awtui;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.blame;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.diff;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.dircache;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.events;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.fnmatch;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.gitrepo;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.hooks;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.ignore;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.ignore.internal;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.fsck;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.io;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.storage.reftree;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.transport.http;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.internal.transport.parser;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.junit;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.junit.ssh;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.junit.time;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lfs;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.merge;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.notes;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.patch;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.pgm;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.pgm.internal;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revplot;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.storage.file;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.storage.pack;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.submodule;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.http;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport.resolver;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.treewalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util.io;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util.sha1;version="[5.5.0,5.6.0)",
+ org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.api;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.archive;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.attributes;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.awtui;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.blame;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.diff;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.dircache;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.events;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.fnmatch;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.gitrepo;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.hooks;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.ignore;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.ignore.internal;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.fsck;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.io;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.storage.reftree;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.transport.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit.ssh;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.junit.time;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lfs;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.merge;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.notes;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.patch;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.pgm;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.pgm.internal;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revplot;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.storage.pack;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.submodule;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.http;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport.resolver;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util.io;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util.sha1;version="[5.6.0,5.7.0)",
org.junit;version="[4.12,5.0.0)",
org.junit.experimental.theories;version="[4.12,5.0.0)",
org.junit.rules;version="[4.12,5.0.0)",
@@ -83,4 +83,4 @@
org.tukaani.xz;version="[1.6.0,2.0)"
Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
org.hamcrest.library;bundle-version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.jgit.transport.ssh;version="5.5.0";x-friends:="org.eclipse.jgit.ssh.apache.test"
+Export-Package: org.eclipse.jgit.transport.ssh;version="5.6.0";x-friends:="org.eclipse.jgit.ssh.apache.test"
diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml
index 5e8a3e6..d8af7dc 100644
--- a/org.eclipse.jgit.test/pom.xml
+++ b/org.eclipse.jgit.test/pom.xml
@@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.test</artifactId>
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java
index c1e078d..d6c7a61 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java
@@ -55,10 +55,9 @@
import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription;
import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
-import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.NullProgressMonitor;
import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.resolver.ReceivePackFactory;
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
@@ -73,8 +72,8 @@ public class AtomicPushTest {
private Object ctx = new Object();
private InMemoryRepository server;
private InMemoryRepository client;
- private ObjectId obj1;
- private ObjectId obj2;
+ private ObjectId commit1;
+ private ObjectId commit2;
@Before
public void setUp() throws Exception {
@@ -92,10 +91,11 @@ public ReceivePack create(Object req, Repository db)
});
uri = testProtocol.register(ctx, server);
- try (ObjectInserter ins = client.newObjectInserter()) {
- obj1 = ins.insert(Constants.OBJ_BLOB, Constants.encode("test"));
- obj2 = ins.insert(Constants.OBJ_BLOB, Constants.encode("file"));
- ins.flush();
+ try (TestRepository<?> clientRepo = new TestRepository<>(client)) {
+ commit1 = clientRepo.commit().noFiles().message("test commit 1")
+ .create();
+ commit2 = clientRepo.commit().noFiles().message("test commit 2")
+ .create();
}
}
@@ -149,13 +149,13 @@ public void pushAtomicDisabled() throws Exception {
List<RemoteRefUpdate> cmds = new ArrayList<>();
cmds.add(new RemoteRefUpdate(
null, null,
- obj1, "refs/heads/one",
+ commit1, "refs/heads/one",
true /* force update */,
null /* no local tracking ref */,
ObjectId.zeroId()));
cmds.add(new RemoteRefUpdate(
null, null,
- obj2, "refs/heads/two",
+ commit2, "refs/heads/two",
true /* force update */,
null /* no local tracking ref */,
ObjectId.zeroId()));
@@ -176,16 +176,16 @@ private List<RemoteRefUpdate> commands() throws IOException {
List<RemoteRefUpdate> cmds = new ArrayList<>();
cmds.add(new RemoteRefUpdate(
null, null,
- obj1, "refs/heads/one",
+ commit1, "refs/heads/one",
true /* force update */,
null /* no local tracking ref */,
ObjectId.zeroId()));
cmds.add(new RemoteRefUpdate(
null, null,
- obj2, "refs/heads/two",
+ commit2, "refs/heads/two",
true /* force update */,
null /* no local tracking ref */,
- obj1));
+ commit1));
return cmds;
}
}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushOptionsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushOptionsTest.java
index fd1c3bf..18946e0 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushOptionsTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushOptionsTest.java
@@ -62,10 +62,9 @@
import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription;
import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
import org.eclipse.jgit.junit.RepositoryTestCase;
-import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.NullProgressMonitor;
import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -79,8 +78,8 @@ public class PushOptionsTest extends RepositoryTestCase {
private Object ctx = new Object();
private InMemoryRepository server;
private InMemoryRepository client;
- private ObjectId obj1;
- private ObjectId obj2;
+ private ObjectId commit1;
+ private ObjectId commit2;
private ReceivePack receivePack;
@Override
@@ -101,10 +100,11 @@ public void setUp() throws Exception {
uri = testProtocol.register(ctx, server);
- try (ObjectInserter ins = client.newObjectInserter()) {
- obj1 = ins.insert(Constants.OBJ_BLOB, Constants.encode("test"));
- obj2 = ins.insert(Constants.OBJ_BLOB, Constants.encode("file"));
- ins.flush();
+ try (TestRepository<?> clientRepo = new TestRepository<>(client)) {
+ commit1 = clientRepo.commit().noFiles().message("test commit 1")
+ .create();
+ commit2 = clientRepo.commit().noFiles().message("test commit 2")
+ .create();
}
}
@@ -121,12 +121,12 @@ private static InMemoryRepository newRepo(String name) {
private List<RemoteRefUpdate> commands(boolean atomicSafe)
throws IOException {
List<RemoteRefUpdate> cmds = new ArrayList<>();
- cmds.add(new RemoteRefUpdate(null, null, obj1, "refs/heads/one",
+ cmds.add(new RemoteRefUpdate(null, null, commit1, "refs/heads/one",
true /* force update */, null /* no local tracking ref */,
ObjectId.zeroId()));
- cmds.add(new RemoteRefUpdate(null, null, obj2, "refs/heads/two",
+ cmds.add(new RemoteRefUpdate(null, null, commit2, "refs/heads/two",
true /* force update */, null /* no local tracking ref */,
- atomicSafe ? ObjectId.zeroId() : obj1));
+ atomicSafe ? ObjectId.zeroId() : commit1));
return cmds;
}
diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index 1e0d052..38f63f9 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.5.0.qualifier
+Bundle-Version: 5.6.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.awtui;version="5.5.0"
-Import-Package: org.eclipse.jgit.errors;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.lib;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.nls;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revplot;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.revwalk;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.transport;version="[5.5.0,5.6.0)",
- org.eclipse.jgit.util;version="[5.5.0,5.6.0)"
+Export-Package: org.eclipse.jgit.awtui;version="5.6.0"
+Import-Package: org.eclipse.jgit.errors;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.lib;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.nls;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revplot;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.transport;version="[5.6.0,5.7.0)",
+ org.eclipse.jgit.util;version="[5.6.0,5.7.0)"
diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF
index f8818b3..c19a634 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.5.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.5.0.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.6.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml
index 6e9d3d5..7d6c77d 100644
--- a/org.eclipse.jgit.ui/pom.xml
+++ b/org.eclipse.jgit.ui/pom.xml
@@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ui</artifactId>
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index f50ea9a..e4d023d 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -1,166 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jgit" version="2">
- <resource path="src/org/eclipse/jgit/dircache/DirCacheEntry.java" type="org.eclipse.jgit.dircache.DirCacheEntry">
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="getLastModifiedInstant()"/>
- </message_arguments>
- </filter>
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="mightBeRacilyClean(Instant)"/>
- </message_arguments>
- </filter>
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="setLastModified(Instant)"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/lib/AnyObjectId.java" type="org.eclipse.jgit.lib.AnyObjectId">
+ <resource path="src/org/eclipse/jgit/transport/SshConstants.java" type="org.eclipse.jgit.transport.SshConstants">
<filter id="1141899266">
<message_arguments>
- <message_argument value="5.4"/>
<message_argument value="5.5"/>
- <message_argument value="isEqual(AnyObjectId, AnyObjectId)"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="CONFIG_FILESYSTEM_SECTION"/>
- </message_arguments>
- </filter>
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="CONFIG_KEY_MIN_RACY_THRESHOLD"/>
- </message_arguments>
- </filter>
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="CONFIG_KEY_TIMESTAMP_RESOLUTION"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java" type="org.eclipse.jgit.treewalk.WorkingTreeIterator">
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="getEntryLastModifiedInstant()"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java" type="org.eclipse.jgit.treewalk.WorkingTreeIterator$Entry">
- <filter id="336695337">
- <message_arguments>
- <message_argument value="org.eclipse.jgit.treewalk.WorkingTreeIterator.Entry"/>
- <message_argument value="getLastModifiedInstant()"/>
- </message_arguments>
- </filter>
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="getLastModifiedInstant()"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS">
- <filter id="338792546">
- <message_arguments>
- <message_argument value="org.eclipse.jgit.util.FS"/>
- <message_argument value="getFsTimerResolution(Path)"/>
- </message_arguments>
- </filter>
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="getFileStoreAttributes(Path)"/>
- </message_arguments>
- </filter>
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="lastModifiedInstant(File)"/>
- </message_arguments>
- </filter>
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="lastModifiedInstant(Path)"/>
- </message_arguments>
- </filter>
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="setAsyncFileStoreAttributes(boolean)"/>
- </message_arguments>
- </filter>
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="setLastModified(Path, Instant)"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS$Attributes">
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="getLastModifiedInstant()"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS$FileStoreAttributes">
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="FileStoreAttributes"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/util/References.java" type="org.eclipse.jgit.util.References">
- <filter id="1108344834">
- <message_arguments>
- <message_argument value="5.4"/>
- <message_argument value="5.5"/>
- <message_argument value="org.eclipse.jgit.util.References"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/util/SimpleLruCache.java" type="org.eclipse.jgit.util.SimpleLruCache">
- <filter id="1109393411">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="org.eclipse.jgit.util.SimpleLruCache"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/util/Stats.java" type="org.eclipse.jgit.util.Stats">
- <filter id="1109393411">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="org.eclipse.jgit.util.Stats"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/util/SystemReader.java" type="org.eclipse.jgit.util.SystemReader">
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="getSystemConfig()"/>
- </message_arguments>
- </filter>
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="5.1.9"/>
- <message_argument value="getUserConfig()"/>
+ <message_argument value="5.6"/>
+ <message_argument value="HASH_KNOWN_HOSTS"/>
</message_arguments>
</filter>
</resource>
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 4184a54..35f29aa 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.5.0.qualifier
+Bundle-Version: 5.6.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.jgit.annotations;version="5.5.0",
- org.eclipse.jgit.api;version="5.5.0";
+Export-Package: org.eclipse.jgit.annotations;version="5.6.0",
+ org.eclipse.jgit.api;version="5.6.0";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff,
@@ -22,53 +22,53 @@
org.eclipse.jgit.submodule,
org.eclipse.jgit.transport,
org.eclipse.jgit.merge",
- org.eclipse.jgit.api.errors;version="5.5.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors",
- org.eclipse.jgit.attributes;version="5.5.0",
- org.eclipse.jgit.blame;version="5.5.0";
+ org.eclipse.jgit.api.errors;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors",
+ org.eclipse.jgit.attributes;version="5.6.0",
+ org.eclipse.jgit.blame;version="5.6.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.5.0";
+ org.eclipse.jgit.diff;version="5.6.0";
uses:="org.eclipse.jgit.patch,
org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util",
- org.eclipse.jgit.dircache;version="5.5.0";
+ org.eclipse.jgit.dircache;version="5.6.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util,
org.eclipse.jgit.events,
org.eclipse.jgit.attributes",
- org.eclipse.jgit.errors;version="5.5.0";
+ org.eclipse.jgit.errors;version="5.6.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.internal.storage.pack,
org.eclipse.jgit.transport,
org.eclipse.jgit.dircache",
- org.eclipse.jgit.events;version="5.5.0";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.fnmatch;version="5.5.0",
- org.eclipse.jgit.gitrepo;version="5.5.0";
+ org.eclipse.jgit.events;version="5.6.0";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.fnmatch;version="5.6.0",
+ org.eclipse.jgit.gitrepo;version="5.6.0";
uses:="org.eclipse.jgit.api,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.xml.sax.helpers,
org.xml.sax",
- org.eclipse.jgit.gitrepo.internal;version="5.5.0";x-internal:=true,
- org.eclipse.jgit.hooks;version="5.5.0";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.ignore;version="5.5.0",
- org.eclipse.jgit.ignore.internal;version="5.5.0";x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal;version="5.5.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
- org.eclipse.jgit.internal.fsck;version="5.5.0";x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.ketch;version="5.5.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.revwalk;version="5.5.0";x-internal:=true,
- org.eclipse.jgit.internal.storage.dfs;version="5.5.0";
+ org.eclipse.jgit.gitrepo.internal;version="5.6.0";x-internal:=true,
+ org.eclipse.jgit.hooks;version="5.6.0";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.ignore;version="5.6.0",
+ org.eclipse.jgit.ignore.internal;version="5.6.0";x-friends:="org.eclipse.jgit.test",
+ org.eclipse.jgit.internal;version="5.6.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
+ org.eclipse.jgit.internal.fsck;version="5.6.0";x-friends:="org.eclipse.jgit.test",
+ org.eclipse.jgit.internal.ketch;version="5.6.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
+ org.eclipse.jgit.internal.revwalk;version="5.6.0";x-internal:=true,
+ org.eclipse.jgit.internal.storage.dfs;version="5.6.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.5.0";
+ org.eclipse.jgit.internal.storage.file;version="5.6.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.junit,
org.eclipse.jgit.junit.http,
@@ -77,19 +77,19 @@
org.eclipse.jgit.pgm,
org.eclipse.jgit.pgm.test,
org.eclipse.jgit.ssh.apache",
- org.eclipse.jgit.internal.storage.io;version="5.5.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.pack;version="5.5.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.reftable;version="5.5.0";
+ org.eclipse.jgit.internal.storage.io;version="5.6.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
+ org.eclipse.jgit.internal.storage.pack;version="5.6.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
+ org.eclipse.jgit.internal.storage.reftable;version="5.6.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.5.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.submodule;version="5.5.0";x-internal:=true,
- org.eclipse.jgit.internal.transport.http;version="5.5.0";x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.parser;version="5.5.0";x-friends:="org.eclipse.jgit.http.server,org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.ssh;version="5.5.0";x-friends:="org.eclipse.jgit.ssh.apache",
- org.eclipse.jgit.lib;version="5.5.0";
+ org.eclipse.jgit.internal.storage.reftree;version="5.6.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
+ org.eclipse.jgit.internal.submodule;version="5.6.0";x-internal:=true,
+ org.eclipse.jgit.internal.transport.http;version="5.6.0";x-friends:="org.eclipse.jgit.test",
+ org.eclipse.jgit.internal.transport.parser;version="5.6.0";x-friends:="org.eclipse.jgit.http.server,org.eclipse.jgit.test",
+ org.eclipse.jgit.internal.transport.ssh;version="5.6.0";x-friends:="org.eclipse.jgit.ssh.apache",
+ org.eclipse.jgit.lib;version="5.6.0";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util,
@@ -99,33 +99,33 @@
org.eclipse.jgit.treewalk,
org.eclipse.jgit.transport,
org.eclipse.jgit.submodule",
- org.eclipse.jgit.lib.internal;version="5.5.0";x-internal:=true,
- org.eclipse.jgit.merge;version="5.5.0";
+ org.eclipse.jgit.lib.internal;version="5.6.0";x-internal:=true,
+ org.eclipse.jgit.merge;version="5.6.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.diff,
org.eclipse.jgit.dircache,
org.eclipse.jgit.api",
- org.eclipse.jgit.nls;version="5.5.0",
- org.eclipse.jgit.notes;version="5.5.0";
+ org.eclipse.jgit.nls;version="5.6.0",
+ org.eclipse.jgit.notes;version="5.6.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.merge",
- org.eclipse.jgit.patch;version="5.5.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff",
- org.eclipse.jgit.revplot;version="5.5.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk",
- org.eclipse.jgit.revwalk;version="5.5.0";
+ org.eclipse.jgit.patch;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff",
+ org.eclipse.jgit.revplot;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk",
+ org.eclipse.jgit.revwalk;version="5.6.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff,
org.eclipse.jgit.revwalk.filter",
- org.eclipse.jgit.revwalk.filter;version="5.5.0";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util",
- org.eclipse.jgit.storage.file;version="5.5.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util",
- org.eclipse.jgit.storage.pack;version="5.5.0";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.submodule;version="5.5.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk",
- org.eclipse.jgit.transport;version="5.5.0";
+ org.eclipse.jgit.revwalk.filter;version="5.6.0";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util",
+ org.eclipse.jgit.storage.file;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util",
+ org.eclipse.jgit.storage.pack;version="5.6.0";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.submodule;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk",
+ org.eclipse.jgit.transport;version="5.6.0";
uses:="org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.internal.storage.pack,
@@ -138,24 +138,24 @@
org.eclipse.jgit.transport.http,
org.eclipse.jgit.errors,
org.eclipse.jgit.storage.pack",
- org.eclipse.jgit.transport.http;version="5.5.0";uses:="javax.net.ssl",
- org.eclipse.jgit.transport.resolver;version="5.5.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport",
- org.eclipse.jgit.treewalk;version="5.5.0";
+ org.eclipse.jgit.transport.http;version="5.6.0";uses:="javax.net.ssl",
+ org.eclipse.jgit.transport.resolver;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport",
+ org.eclipse.jgit.treewalk;version="5.6.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.attributes,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util,
org.eclipse.jgit.dircache",
- org.eclipse.jgit.treewalk.filter;version="5.5.0";uses:="org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util;version="5.5.0";
+ org.eclipse.jgit.treewalk.filter;version="5.6.0";uses:="org.eclipse.jgit.treewalk",
+ org.eclipse.jgit.util;version="5.6.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.transport.http,
org.eclipse.jgit.storage.file,
org.ietf.jgss",
- org.eclipse.jgit.util.io;version="5.5.0",
- org.eclipse.jgit.util.sha1;version="5.5.0",
- org.eclipse.jgit.util.time;version="5.5.0"
+ org.eclipse.jgit.util.io;version="5.6.0",
+ org.eclipse.jgit.util.sha1;version="5.6.0",
+ org.eclipse.jgit.util.time;version="5.6.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
com.jcraft.jsch;version="[0.1.37,0.2.0)",
diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
index 780edcd..01c9aa0 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.5.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit;version="5.5.0.qualifier";roots="."
+Bundle-Version: 5.6.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit;version="5.6.0.qualifier";roots="."
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index cd187bf..6b8cdaa 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -53,7 +53,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit</artifactId>
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
index 6b09faf..280d95a 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -448,6 +448,7 @@
noMergeBase=No merge base could be determined. Reason={0}. {1}
noMergeHeadSpecified=No merge head specified
nonBareLinkFilesNotSupported=Link files are not supported with nonbare repos
+nonCommitToHeads=Cannot point a branch to a non-commit object
noPathAttributesFound=No Attributes found for {0}.
noSuchRef=no such ref
noSuchSubmodule=no such submodule {0}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
index 6a7d22d..1aae4f4 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
@@ -509,6 +509,7 @@ public static JGitText get() {
/***/ public String noMergeBase;
/***/ public String noMergeHeadSpecified;
/***/ public String nonBareLinkFilesNotSupported;
+ /***/ public String nonCommitToHeads;
/***/ public String noPathAttributesFound;
/***/ public String noSuchRef;
/***/ public String noSuchSubmodule;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java
index c6e2fae..16e7a0d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java
@@ -412,8 +412,7 @@ DfsBlock getOrLoad(BlockBasedFile file, long position, DfsReader ctx,
getStat(statMiss, key).incrementAndGet();
boolean credit = true;
try {
- v = file.readOneBlock(requestedPosition, ctx,
- fileChannel.get());
+ v = file.readOneBlock(position, ctx, fileChannel.get());
credit = false;
} finally {
if (credit) {
@@ -450,7 +449,7 @@ DfsBlock getOrLoad(BlockBasedFile file, long position, DfsReader ctx,
}
@SuppressWarnings("unchecked")
- private void reserveSpace(int reserve, DfsStreamKey key) {
+ private void reserveSpace(long reserve, DfsStreamKey key) {
clockLock.lock();
try {
long live = LongStream.of(getCurrentSize()).sum() + reserve;
@@ -487,7 +486,7 @@ private void reserveSpace(int reserve, DfsStreamKey key) {
}
}
- private void creditSpace(int credit, DfsStreamKey key) {
+ private void creditSpace(long credit, DfsStreamKey key) {
clockLock.lock();
try {
getStat(liveBytes, key).addAndGet(-credit);
@@ -497,7 +496,7 @@ private void creditSpace(int credit, DfsStreamKey key) {
}
@SuppressWarnings("unchecked")
- private void addToClock(Ref ref, int credit) {
+ private void addToClock(Ref ref, long credit) {
clockLock.lock();
try {
if (credit != 0) {
@@ -521,17 +520,20 @@ void put(DfsBlock v) {
*
* @param key
* the stream key of the pack.
+ * @param position
+ * the position in the key. The default should be 0.
* @param loader
* the function to load the reference.
* @return the object reference.
* @throws IOException
* the reference was not in the cache and could not be loaded.
*/
- <T> Ref<T> getOrLoadRef(DfsStreamKey key, RefLoader<T> loader)
+ <T> Ref<T> getOrLoadRef(
+ DfsStreamKey key, long position, RefLoader<T> loader)
throws IOException {
- int slot = slot(key, 0);
+ int slot = slot(key, position);
HashEntry e1 = table.get(slot);
- Ref<T> ref = scanRef(e1, key, 0);
+ Ref<T> ref = scanRef(e1, key, position);
if (ref != null) {
getStat(statHit, key).incrementAndGet();
return ref;
@@ -543,7 +545,7 @@ <T> Ref<T> getOrLoadRef(DfsStreamKey key, RefLoader<T> loader)
try {
HashEntry e2 = table.get(slot);
if (e2 != e1) {
- ref = scanRef(e2, key, 0);
+ ref = scanRef(e2, key, position);
if (ref != null) {
getStat(statHit, key).incrementAndGet();
return ref;
@@ -574,10 +576,10 @@ <T> Ref<T> getOrLoadRef(DfsStreamKey key, RefLoader<T> loader)
}
<T> Ref<T> putRef(DfsStreamKey key, long size, T v) {
- return put(key, 0, (int) Math.min(size, Integer.MAX_VALUE), v);
+ return put(key, 0, size, v);
}
- <T> Ref<T> put(DfsStreamKey key, long pos, int size, T v) {
+ <T> Ref<T> put(DfsStreamKey key, long pos, long size, T v) {
int slot = slot(key, pos);
HashEntry e1 = table.get(slot);
Ref<T> ref = scanRef(e1, key, pos);
@@ -720,12 +722,12 @@ private static final class HashEntry {
static final class Ref<T> {
final DfsStreamKey key;
final long position;
- final int size;
+ final long size;
volatile T value;
Ref next;
volatile boolean hot;
- Ref(DfsStreamKey key, long position, int size, T v) {
+ Ref(DfsStreamKey key, long position, long size, T v) {
this.key = key;
this.position = position;
this.size = size;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsCachedPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsCachedPack.java
index 3605236e..9b28074 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsCachedPack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsCachedPack.java
@@ -61,6 +61,13 @@ public class DfsCachedPack extends CachedPack {
}
/**
+ * @return the pack passed to the constructor
+ */
+ public DfsPackFile getPackFile() {
+ return pack;
+ }
+
+ /**
* Get the description of the pack.
*
* @return the description of the pack.
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
index be1387e..6c69019 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
@@ -89,6 +89,7 @@
*/
public final class DfsPackFile extends BlockBasedFile {
private static final int REC_SIZE = Constants.OBJECT_ID_LENGTH + 8;
+ private static final long REF_POSITION = 0;
/**
* Lock for initialization of {@link #index} and {@link #corruptObjects}.
@@ -194,45 +195,10 @@ private PackIndex idx(DfsReader ctx) throws IOException {
try {
DfsStreamKey idxKey = desc.getStreamKey(INDEX);
- DfsBlockCache.Ref<PackIndex> idxref = cache.getOrLoadRef(idxKey,
- () -> {
- try {
- ctx.stats.readIdx++;
- long start = System.nanoTime();
- try (ReadableChannel rc = ctx.db.openFile(desc,
- INDEX)) {
- InputStream in = Channels
- .newInputStream(rc);
- int wantSize = 8192;
- int bs = rc.blockSize();
- if (0 < bs && bs < wantSize) {
- bs = (wantSize / bs) * bs;
- } else if (bs <= 0) {
- bs = wantSize;
- }
- PackIndex idx = PackIndex.read(
- new BufferedInputStream(in, bs));
- int sz = (int) Math.min(
- idx.getObjectCount() * REC_SIZE,
- Integer.MAX_VALUE);
- ctx.stats.readIdxBytes += rc.position();
- index = idx;
- return new DfsBlockCache.Ref<>(idxKey, 0,
- sz, idx);
- } finally {
- ctx.stats.readIdxMicros += elapsedMicros(
- start);
- }
- } catch (EOFException e) {
- throw new IOException(MessageFormat.format(
- DfsText.get().shortReadOfIndex,
- desc.getFileName(INDEX)), e);
- } catch (IOException e) {
- throw new IOException(MessageFormat.format(
- DfsText.get().cannotReadIndex,
- desc.getFileName(INDEX)), e);
- }
- });
+ DfsBlockCache.Ref<PackIndex> idxref = cache.getOrLoadRef(
+ idxKey,
+ REF_POSITION,
+ () -> loadPackIndex(ctx, idxKey));
PackIndex idx = idxref.get();
if (index == null && idx != null) {
index = idx;
@@ -267,44 +233,10 @@ PackBitmapIndex getBitmapIndex(DfsReader ctx) throws IOException {
PackIndex idx = idx(ctx);
PackReverseIndex revidx = getReverseIdx(ctx);
DfsStreamKey bitmapKey = desc.getStreamKey(BITMAP_INDEX);
- DfsBlockCache.Ref<PackBitmapIndex> idxref = cache
- .getOrLoadRef(bitmapKey, () -> {
- ctx.stats.readBitmap++;
- long start = System.nanoTime();
- try (ReadableChannel rc = ctx.db.openFile(desc,
- BITMAP_INDEX)) {
- long size;
- PackBitmapIndex bmidx;
- try {
- InputStream in = Channels.newInputStream(rc);
- int wantSize = 8192;
- int bs = rc.blockSize();
- if (0 < bs && bs < wantSize) {
- bs = (wantSize / bs) * bs;
- } else if (bs <= 0) {
- bs = wantSize;
- }
- in = new BufferedInputStream(in, bs);
- bmidx = PackBitmapIndex.read(in, idx, revidx);
- } finally {
- size = rc.position();
- ctx.stats.readIdxBytes += size;
- ctx.stats.readIdxMicros += elapsedMicros(start);
- }
- int sz = (int) Math.min(size, Integer.MAX_VALUE);
- bitmapIndex = bmidx;
- return new DfsBlockCache.Ref<>(bitmapKey, 0, sz,
- bmidx);
- } catch (EOFException e) {
- throw new IOException(MessageFormat.format(
- DfsText.get().shortReadOfIndex,
- desc.getFileName(BITMAP_INDEX)), e);
- } catch (IOException e) {
- throw new IOException(MessageFormat.format(
- DfsText.get().cannotReadIndex,
- desc.getFileName(BITMAP_INDEX)), e);
- }
- });
+ DfsBlockCache.Ref<PackBitmapIndex> idxref = cache.getOrLoadRef(
+ bitmapKey,
+ REF_POSITION,
+ () -> loadBitmapIndex(ctx, bitmapKey, idx, revidx));
PackBitmapIndex bmidx = idxref.get();
if (bitmapIndex == null && bmidx != null) {
bitmapIndex = bmidx;
@@ -326,14 +258,10 @@ PackReverseIndex getReverseIdx(DfsReader ctx) throws IOException {
PackIndex idx = idx(ctx);
DfsStreamKey revKey = new DfsStreamKey.ForReverseIndex(
desc.getStreamKey(INDEX));
- DfsBlockCache.Ref<PackReverseIndex> revref = cache
- .getOrLoadRef(revKey, () -> {
- PackReverseIndex revidx = new PackReverseIndex(idx);
- int sz = (int) Math.min(idx.getObjectCount() * 8,
- Integer.MAX_VALUE);
- reverseIndex = revidx;
- return new DfsBlockCache.Ref<>(revKey, 0, sz, revidx);
- });
+ DfsBlockCache.Ref<PackReverseIndex> revref = cache.getOrLoadRef(
+ revKey,
+ REF_POSITION,
+ () -> loadReverseIdx(ctx, revKey, idx));
PackReverseIndex revidx = revref.get();
if (reverseIndex == null && revidx != null) {
reverseIndex = revidx;
@@ -1091,4 +1019,91 @@ private void setCorrupt(long offset) {
list.add(offset);
}
}
+
+ private DfsBlockCache.Ref<PackIndex> loadPackIndex(
+ DfsReader ctx, DfsStreamKey idxKey) throws IOException {
+ try {
+ ctx.stats.readIdx++;
+ long start = System.nanoTime();
+ try (ReadableChannel rc = ctx.db.openFile(desc, INDEX)) {
+ InputStream in = Channels.newInputStream(rc);
+ int wantSize = 8192;
+ int bs = rc.blockSize();
+ if (0 < bs && bs < wantSize) {
+ bs = (wantSize / bs) * bs;
+ } else if (bs <= 0) {
+ bs = wantSize;
+ }
+ PackIndex idx = PackIndex.read(new BufferedInputStream(in, bs));
+ ctx.stats.readIdxBytes += rc.position();
+ index = idx;
+ return new DfsBlockCache.Ref<>(
+ idxKey,
+ REF_POSITION,
+ idx.getObjectCount() * REC_SIZE,
+ idx);
+ } finally {
+ ctx.stats.readIdxMicros += elapsedMicros(start);
+ }
+ } catch (EOFException e) {
+ throw new IOException(MessageFormat.format(
+ DfsText.get().shortReadOfIndex,
+ desc.getFileName(INDEX)), e);
+ } catch (IOException e) {
+ throw new IOException(MessageFormat.format(
+ DfsText.get().cannotReadIndex,
+ desc.getFileName(INDEX)), e);
+ }
+ }
+
+ private DfsBlockCache.Ref<PackReverseIndex> loadReverseIdx(
+ DfsReader ctx, DfsStreamKey revKey, PackIndex idx) {
+ PackReverseIndex revidx = new PackReverseIndex(idx);
+ reverseIndex = revidx;
+ return new DfsBlockCache.Ref<>(
+ revKey,
+ REF_POSITION,
+ idx.getObjectCount() * 8,
+ revidx);
+ }
+
+ private DfsBlockCache.Ref<PackBitmapIndex> loadBitmapIndex(
+ DfsReader ctx,
+ DfsStreamKey bitmapKey,
+ PackIndex idx,
+ PackReverseIndex revidx) throws IOException {
+ ctx.stats.readBitmap++;
+ long start = System.nanoTime();
+ try (ReadableChannel rc = ctx.db.openFile(desc, BITMAP_INDEX)) {
+ long size;
+ PackBitmapIndex bmidx;
+ try {
+ InputStream in = Channels.newInputStream(rc);
+ int wantSize = 8192;
+ int bs = rc.blockSize();
+ if (0 < bs && bs < wantSize) {
+ bs = (wantSize / bs) * bs;
+ } else if (bs <= 0) {
+ bs = wantSize;
+ }
+ in = new BufferedInputStream(in, bs);
+ bmidx = PackBitmapIndex.read(in, idx, revidx);
+ } finally {
+ size = rc.position();
+ ctx.stats.readIdxBytes += size;
+ ctx.stats.readIdxMicros += elapsedMicros(start);
+ }
+ bitmapIndex = bmidx;
+ return new DfsBlockCache.Ref<>(
+ bitmapKey, REF_POSITION, size, bmidx);
+ } catch (EOFException e) {
+ throw new IOException(MessageFormat.format(
+ DfsText.get().shortReadOfIndex,
+ desc.getFileName(BITMAP_INDEX)), e);
+ } catch (IOException e) {
+ throw new IOException(MessageFormat.format(
+ DfsText.get().cannotReadIndex,
+ desc.getFileName(BITMAP_INDEX)), e);
+ }
+ }
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
index e402de0..954359e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
@@ -1613,6 +1613,24 @@ protected void validateCommands() {
if (cmd.getResult() != Result.NOT_ATTEMPTED)
continue;
+ RevObject newObj = null;
+ if (cmd.getType() == ReceiveCommand.Type.CREATE
+ || cmd.getType() == ReceiveCommand.Type.UPDATE) {
+ try {
+ newObj = walk.parseAny(cmd.getNewId());
+ } catch (IOException e) {
+ cmd.setResult(Result.REJECTED_MISSING_OBJECT,
+ cmd.getNewId().name());
+ continue;
+ }
+ if (cmd.getRefName().startsWith(Constants.R_HEADS)
+ && !(newObj instanceof RevCommit)) {
+ cmd.setResult(Result.REJECTED_OTHER_REASON,
+ JGitText.get().nonCommitToHeads);
+ continue;
+ }
+ }
+
if (cmd.getType() == ReceiveCommand.Type.DELETE) {
if (!isAllowDeletes()) {
// Deletes are not supported on this repository.
@@ -1694,7 +1712,7 @@ protected void validateCommands() {
// Is this possibly a non-fast-forward style update?
//
- RevObject oldObj, newObj;
+ RevObject oldObj;
try {
oldObj = walk.parseAny(cmd.getOldId());
} catch (IOException e) {
@@ -1703,14 +1721,6 @@ protected void validateCommands() {
continue;
}
- try {
- newObj = walk.parseAny(cmd.getNewId());
- } catch (IOException e) {
- cmd.setResult(Result.REJECTED_MISSING_OBJECT, cmd
- .getNewId().name());
- continue;
- }
-
if (oldObj instanceof RevCommit && newObj instanceof RevCommit) {
try {
if (walk.isMergedInto((RevCommit) oldObj,
diff --git a/pom.xml b/pom.xml
index ffef61c..1065595 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<packaging>pom</packaging>
- <version>5.5.0-SNAPSHOT</version>
+ <version>5.6.0-SNAPSHOT</version>
<name>JGit - Parent</name>
<url>${jgit-url}</url>
