Merge branch 'master' into next
* master:
searchForReuse might impact performance in large repositories
Retry loose object read upon "Stale file handle" exception
Ignore missing javadoc in test bundles
Upgrade maven-dependency-plugin to 3.2.0
Upgrade jacoco-maven-plugin to 0.8.7
Upgrade maven-jxr-plugin to 3.1.1
Fix garbage collection failing to delete pack file
Fix PathSuffixFilter: can decide only on full paths
Update jetty to 9.4.42.v20210604
[sshd] Log the full KEX negotiation result
[releng] japicmp: update last release version
CONTRIBUTING: add explicit link to ECA
CONTRIBUTING: Use standard markdown format
Add Eclipse code of conduct and security policy
Change-Id: I9e31cb6e22f5398db6e220f71693e87475c598bd
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index aeac06a..99f67ce 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.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.ant.tasks;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.ant.tasks;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml
index 6025bb7..effb8d4 100644
--- a/org.eclipse.jgit.ant.test/pom.xml
+++ b/org.eclipse.jgit.ant.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 aedfe92..0118476 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.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)"
+ org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)"
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.ant;version="5.13.0",
- org.eclipse.jgit.ant.tasks;version="5.13.0";
+Export-Package: org.eclipse.jgit.ant;version="6.0.0",
+ org.eclipse.jgit.ant.tasks;version="6.0.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 5ebfee1..e5aeb31 100644
--- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,6 @@
Bundle-Name: org.eclipse.jgit.ant - Sources
Bundle-SymbolicName: org.eclipse.jgit.ant.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.13.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.13.0.qualifier";roots="."
+Bundle-Version: 6.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.0.0.qualifier";roots="."
+
diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml
index 710ad30..690dba7 100644
--- a/org.eclipse.jgit.ant/pom.xml
+++ b/org.eclipse.jgit.ant/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ant</artifactId>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.10</version>
+ <version>1.10.8</version>
</dependency>
</dependencies>
diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
index 654b88f..428c0a5 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.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -13,17 +13,18 @@
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.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.nls;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.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.13.0";
+Export-Package: org.eclipse.jgit.archive;version="6.0.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.13.0";x-internal:=true
+ org.eclipse.jgit.archive.internal;version="6.0.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 0a6a40e..d5cda97 100644
--- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,6 @@
Bundle-Name: org.eclipse.jgit.archive - Sources
Bundle-SymbolicName: org.eclipse.jgit.archive.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.13.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.13.0.qualifier";roots="."
+Bundle-Version: 6.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.0.0.qualifier";roots="."
+
diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml
index 81927b0..7dbd8c7 100644
--- a/org.eclipse.jgit.archive/pom.xml
+++ b/org.eclipse.jgit.archive/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.archive</artifactId>
diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml
index a2dcdb5..9a145ea 100644
--- a/org.eclipse.jgit.benchmarks/pom.xml
+++ b/org.eclipse.jgit.benchmarks/pom.xml
@@ -14,7 +14,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jgit</groupId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<artifactId>org.eclipse.jgit.benchmarks</artifactId>
<packaging>jar</packaging>
@@ -70,13 +70,47 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
<configuration>
- <encoding>UTF-8</encoding>
- <source>1.8</source>
- <target>1.8</target>
+ <compilerVersion>${javac.target}</compilerVersion>
+ <source>${javac.target}</source>
+ <target>${javac.target}</target>
<generatedSourcesDirectory>.apt_generated</generatedSourcesDirectory>
</configuration>
+ <executions>
+ <execution>
+ <id>compile-with-errorprone</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <compilerId>javac-with-errorprone</compilerId>
+ <forceJavacCompilerUse>true</forceJavacCompilerUse>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-javac</artifactId>
+ <version>2.8.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-javac-errorprone</artifactId>
+ <version>2.8.5</version>
+ </dependency>
+ <!-- override plexus-compiler-javac-errorprone's dependency on
+ Error Prone with the latest version -->
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ <version>2.3.4</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -165,7 +199,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.2</version>
+ <version>3.1.1</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml
index 3e93db8..056648a 100644
--- a/org.eclipse.jgit.coverage/pom.xml
+++ b/org.eclipse.jgit.coverage/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,88 +27,88 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ant</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.archive</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.apache</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.server</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.server</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ui</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.test</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ant.test</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.test</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm.test</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.test</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.server.test</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
index 9b80629..187c583 100644
--- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test
Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test
-Bundle-Version: 5.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -12,9 +12,9 @@
org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)",
org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)",
org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)",
- org.eclipse.jgit.gpg.bc.internal;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.gpg.bc.internal.keys;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util.sha1;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.gpg.bc.internal;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.gpg.bc.internal.keys;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util.sha1;version="[6.0.0,6.1.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.runner;version="[4.13,5.0.0)",
org.junit.runners;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml
index 1531346..aa09d3f 100644
--- a/org.eclipse.jgit.gpg.bc.test/pom.xml
+++ b/org.eclipse.jgit.gpg.bc.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.gpg.bc.test</artifactId>
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
index 2d306aa..48aad32 100644
--- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
@@ -3,10 +3,10 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.gpg.bc
Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true
-Fragment-Host: org.eclipse.jgit;bundle-version="[5.13.0,5.14.0)"
+Fragment-Host: org.eclipse.jgit;bundle-version="[6.0.0,6.1.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
-Bundle-Version: 5.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.bouncycastle.asn1;version="[1.65.0,2.0.0)",
org.bouncycastle.asn1.cryptlib;version="[1.65.0,2.0.0)",
@@ -29,9 +29,9 @@
org.bouncycastle.util;version="[1.65.0,2.0.0)",
org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)",
org.bouncycastle.util.io;version="[1.65.0,2.0.0)",
- org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.gpg.bc;version="5.13.0",
- org.eclipse.jgit.gpg.bc.internal;version="5.13.0";x-friends:="org.eclipse.jgit.gpg.bc.test",
- org.eclipse.jgit.gpg.bc.internal.keys;version="5.13.0";x-friends:="org.eclipse.jgit.gpg.bc.test"
+Export-Package: org.eclipse.jgit.gpg.bc;version="6.0.0",
+ org.eclipse.jgit.gpg.bc.internal;version="6.0.0";x-friends:="org.eclipse.jgit.gpg.bc.test",
+ org.eclipse.jgit.gpg.bc.internal.keys;version="6.0.0";x-friends:="org.eclipse.jgit.gpg.bc.test"
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF
index 73198cd..58bd8ea 100644
--- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,6 @@
Bundle-Name: org.eclipse.jgit.gpg.bc - Sources
Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.13.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.13.0.qualifier";roots="."
+Bundle-Version: 6.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.0.0.qualifier";roots="."
+
diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml
index 129fa0c..833d23c 100644
--- a/org.eclipse.jgit.gpg.bc/pom.xml
+++ b/org.eclipse.jgit.gpg.bc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.gpg.bc</artifactId>
diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
index 2c1e4ff..0f2d7a3 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.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
@@ -25,11 +25,11 @@
org.apache.http.impl.conn;version="[4.4.0,5.0.0)",
org.apache.http.params;version="[4.3.0,5.0.0)",
org.apache.http.ssl;version="[4.3.0,5.0.0)",
- org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport.http;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)"
-Export-Package: org.eclipse.jgit.transport.http.apache;version="5.13.0";
+ org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.nls;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.http;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)"
+Export-Package: org.eclipse.jgit.transport.http.apache;version="6.0.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 7d27ade..1b04dca 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.13.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.13.0.qualifier";roots="."
+Bundle-Version: 6.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml
index 30afcc4..9b5e626 100644
--- a/org.eclipse.jgit.http.apache/pom.xml
+++ b/org.eclipse.jgit.http.apache/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 1fec9f4..fe18caf 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.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.http.server;version="5.13.0",
- org.eclipse.jgit.http.server.glue;version="5.13.0";
+Export-Package: org.eclipse.jgit.http.server;version="6.0.0",
+ org.eclipse.jgit.http.server.glue;version="6.0.0";
uses:="javax.servlet,javax.servlet.http",
- org.eclipse.jgit.http.server.resolver;version="5.13.0";
+ org.eclipse.jgit.http.server.resolver;version="6.0.0";
uses:="org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.lib,
org.eclipse.jgit.transport,
@@ -18,14 +18,14 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
javax.servlet.http;version="[2.5.0,3.2.0)",
- org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.transport.parser;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport.resolver;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)"
+ org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.nls;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.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 af642d7..70181b6 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.13.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.13.0.qualifier";roots="."
+Bundle-Version: 6.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index 8125d27..f0935c3 100644
--- a/org.eclipse.jgit.http.server/pom.xml
+++ b/org.eclipse.jgit.http.server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 1aef1cd..c085e7e 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.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -28,26 +28,26 @@
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.13.0,5.14.0)",
- org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.http.server;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.http.server.glue;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.http.server.resolver;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.junit.http;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport.http;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport.resolver;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.http.server;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.http.server.glue;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.http.server.resolver;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit.http;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.nls;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.http;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.http.apache;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
org.hamcrest;version="[1.1.0,2.0.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml
index d3c154d..9137db7 100644
--- a/org.eclipse.jgit.http.test/pom.xml
+++ b/org.eclipse.jgit.http.test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 d715806..742b3dd8 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.13.0.qualifier
+Bundle-Version: 6.0.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.13.0,5.14.0)",
- org.eclipse.jgit.http.server;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport.resolver;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.http.server;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.0.0,6.1.0)",
org.junit;version="[4.13,5.0.0)"
-Export-Package: org.eclipse.jgit.junit.http;version="5.13.0";
+Export-Package: org.eclipse.jgit.junit.http;version="6.0.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 4ed1549..e24f9e4 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.13.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.13.0.qualifier";roots="."
+Bundle-Version: 6.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml
index d7202f8..6d4038e 100644
--- a/org.eclipse.jgit.junit.http/pom.xml
+++ b/org.eclipse.jgit.junit.http/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 16aeb12..a347715 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.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
@@ -33,16 +33,16 @@
org.apache.sshd.server.subsystem;version="[2.6.0,2.7.0)",
org.apache.sshd.sftp;version="[2.6.0,2.7.0)",
org.apache.sshd.sftp.server;version="[2.6.0,2.7.0)",
- org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.experimental.theories;version="[4.13,5.0.0)",
org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit.ssh;version="5.13.0"
+Export-Package: org.eclipse.jgit.junit.ssh;version="6.0.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 32d199c..e0c30ff 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.13.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.13.0.qualifier";roots="."
+Bundle-Version: 6.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml
index e406c74..a6f4660 100644
--- a/org.eclipse.jgit.junit.ssh/pom.xml
+++ b/org.eclipse.jgit.junit.ssh/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 4ebbc22..90fbfd8 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.13.0.qualifier
+Bundle-Version: 6.0.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.13.0,5.14.0)",
- org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.dircache;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.merge;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport;version="5.13.0",
- org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util.time;version="[5.13.0,5.14.0)",
+Import-Package: org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.dircache;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.merge;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="6.0.0",
+ org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util.io;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util.time;version="[6.0.0,6.1.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.rules;version="[4.13,5.0.0)",
org.junit.runner;version="[4.13,5.0.0)",
org.junit.runners;version="[4.13,5.0.0)",
org.junit.runners.model;version="[4.13,5.0.0)",
org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit;version="5.13.0";
+Export-Package: org.eclipse.jgit.junit;version="6.0.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.13.0";uses:="org.eclipse.jgit.util.time"
+ org.eclipse.jgit.junit.time;version="6.0.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 d75622b..f2b1b25 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.13.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.13.0.qualifier";roots="."
+Bundle-Version: 6.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml
index fc6544e..aa411bf 100644
--- a/org.eclipse.jgit.junit/pom.xml
+++ b/org.eclipse.jgit.junit/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 3ab248e..c441529 100644
--- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
@@ -3,16 +3,16 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.lfs.server.test
Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test
-Bundle-Version: 5.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
javax.servlet.http;version="[3.1.0,4.0.0)",
- org.apache.http;version="[4.3.0,5.0.0)",
+ org.apache.http;version="[4.4.0,5.0.0)",
org.apache.http.client;version="[4.4.0,5.0.0)",
org.apache.http.client.methods;version="[4.4.0,5.0.0)",
- org.apache.http.entity;version="[4.3.0,5.0.0)",
+ org.apache.http.entity;version="[4.4.0,5.0.0)",
org.apache.http.impl.client;version="[4.4.0,5.0.0)",
org.eclipse.jetty.continuation;version="[9.4.5,10.0.0)",
org.eclipse.jetty.http;version="[9.4.5,10.0.0)",
@@ -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.13.0,5.14.0)",
- org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.junit.http;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs.server;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs.server.fs;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs.test;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit.http;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs.server;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs.test;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.rules;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml
index 12d87b2..2c1b134 100644
--- a/org.eclipse.jgit.lfs.server.test/pom.xml
+++ b/org.eclipse.jgit.lfs.server.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 fea47b5..76050e1 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.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs.server;version="5.13.0";
+Export-Package: org.eclipse.jgit.lfs.server;version="6.0.0";
uses:="javax.servlet.http,
org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.fs;version="5.13.0";
+ org.eclipse.jgit.lfs.server.fs;version="6.0.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.13.0";x-internal:=true,
- org.eclipse.jgit.lfs.server.s3;version="5.13.0";
+ org.eclipse.jgit.lfs.server.internal;version="6.0.0";x-internal:=true,
+ org.eclipse.jgit.lfs.server.s3;version="6.0.0";
uses:="org.eclipse.jgit.lfs.server,
org.eclipse.jgit.lfs.lib"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -24,15 +24,15 @@
javax.servlet.annotation;version="[3.1.0,4.0.0)",
javax.servlet.http;version="[3.1.0,4.0.0)",
org.apache.http;version="[4.3.0,5.0.0)",
- org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs.internal;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport.http;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs.internal;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.nls;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.http;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.http.apache;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.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 c940f2f..c36373e 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.13.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.13.0.qualifier";roots="."
+Bundle-Version: 6.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml
index ced9532..948c65a 100644
--- a/org.eclipse.jgit.lfs.server/pom.xml
+++ b/org.eclipse.jgit.lfs.server/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 35f2af0..24abf78 100644
--- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
@@ -3,24 +3,24 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.lfs.test
Bundle-SymbolicName: org.eclipse.jgit.lfs.test
-Bundle-Version: 5.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.attributes;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+Import-Package: org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.attributes;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.runner;version="[4.13,5.0.0)",
org.junit.runners;version="[4.13,5.0.0)"
-Export-Package: org.eclipse.jgit.lfs.test;version="5.13.0";x-friends:="org.eclipse.jgit.lfs.server.test"
+Export-Package: org.eclipse.jgit.lfs.test;version="6.0.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 0aac35c..262258c 100644
--- a/org.eclipse.jgit.lfs.test/pom.xml
+++ b/org.eclipse.jgit.lfs.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.test</artifactId>
diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
index ced80e7..3eb5a76 100644
--- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
@@ -3,31 +3,31 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.lfs
Bundle-SymbolicName: org.eclipse.jgit.lfs
-Bundle-Version: 5.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs;version="5.13.0",
- org.eclipse.jgit.lfs.errors;version="5.13.0",
- org.eclipse.jgit.lfs.internal;version="5.13.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.13.0"
+Export-Package: org.eclipse.jgit.lfs;version="6.0.0",
+ org.eclipse.jgit.lfs.errors;version="6.0.0",
+ org.eclipse.jgit.lfs.internal;version="6.0.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="6.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: com.google.gson;version="[2.8.0,3.0.0)",
- com.google.gson.stream;version="[2.8.0,3.0.0)",
- org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)";resolution:=optional,
- org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.attributes;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.diff;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.hooks;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.storage.pack;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport.http;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)"
+Import-Package: com.google.gson;version="[2.8.2,3.0.0)",
+ com.google.gson.stream;version="[2.8.2,3.0.0)",
+ org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)";resolution:=optional,
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.attributes;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.diff;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.hooks;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.nls;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.storage.pack;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.http;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util.io;version="[6.0.0,6.1.0)"
diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
index 4cf367a..5d14b1c 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.13.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.13.0.qualifier";roots="."
+Bundle-Version: 6.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml
index ead51e1..e1063e1 100644
--- a/org.eclipse.jgit.lfs/pom.xml
+++ b/org.eclipse.jgit.lfs/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 59700d8..526e8b3 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.13.0.qualifier"
+ version="6.0.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 52fef69..276401c 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
index 4917822..6883afc 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.gpg.bc"
label="%featureName"
- version="5.13.0.qualifier"
+ version="6.0.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.13.0" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="6.0.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml
index 473979b..a05abbc 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 af252d3..22f995e 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.13.0.qualifier"
+ version="6.0.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.13.0" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="6.0.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 2e7831a..85fa1e7 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 2e936bc..65b70d5 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.13.0.qualifier"
+ version="6.0.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.13.0" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="6.0.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 0a279e3..666784d 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 eb95bdd..4b5032e 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.13.0.qualifier"
+ version="6.0.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.13.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="6.0.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 9a2d725..86fae12 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 56cd133..d97ce75 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.13.0.qualifier"
+ version="6.0.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.13.0" match="equivalent"/>
- <import feature="org.eclipse.jgit.lfs" version="5.13.0" match="equivalent"/>
- <import feature="org.eclipse.jgit.ssh.apache" version="5.13.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="6.0.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit.lfs" version="6.0.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit.ssh.apache" version="6.0.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 04f31a6..8139810 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 4ed82c8..f36717e 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 de63500..eb0a658 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.13.0.qualifier"
+ version="6.0.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.13.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="6.0.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 4ea10bf..a9e5539 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.eclipse.jgit.feature</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 42d6f9c..46ea779 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.13.0.qualifier"
+ version="6.0.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.13.0" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="6.0.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 d5e9fd7..886b9b3 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
index 902f18b..06a6ed9 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.ssh.jsch"
label="%featureName"
- version="5.13.0.qualifier"
+ version="6.0.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.13.0" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="6.0.0" match="equivalent"/>
</requires>
<plugin
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml
index 179825f..70bb08b 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 74c0d3f..ccd730f 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.13.0.qualifier
+Bundle-Version: 6.0.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 b1511c1..1660e08 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 044d073..f3287f1 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -16,7 +16,7 @@
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 30dfef5..809f438 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.13.0.qualifier
+Bundle-Version: 6.0.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.13.0,5.14.0)",
- org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.diff;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.dircache;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.file;version="5.13.0",
- org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.merge;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.pgm;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.pgm.internal;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.pgm.opt;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)",
+Import-Package: org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.diff;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.dircache;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="6.0.0",
+ org.eclipse.jgit.junit;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.merge;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.pgm;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.pgm.internal;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.pgm.opt;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util.io;version="[6.0.0,6.1.0)",
org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.rules;version="[4.13,5.0.0)",
diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml
index 3e6eaad..85f96c5 100644
--- a/org.eclipse.jgit.pgm.test/pom.xml
+++ b/org.eclipse.jgit.pgm.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 4a3fcc5..c56224e 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.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -14,46 +14,46 @@
org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util;version="[9.4.5,10.0.0)",
org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)",
- org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.archive;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.awtui;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.blame;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.diff;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.dircache;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.gitrepo;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.io;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs.server;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs.server.fs;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs.server.s3;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.merge;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.notes;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revplot;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.storage.pack;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport.resolver;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport.sshd;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.archive;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.awtui;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.blame;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.diff;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.dircache;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.gitrepo;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.io;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs.server;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs.server.s3;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.merge;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.nls;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.notes;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revplot;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk.filter;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.storage.pack;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.http.apache;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.sshd;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util.io;version="[6.0.0,6.1.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.13.0";
+Export-Package: org.eclipse.jgit.console;version="6.0.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util",
- org.eclipse.jgit.pgm;version="5.13.0";
+ org.eclipse.jgit.pgm;version="6.0.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util.io,
org.eclipse.jgit.awtui,
@@ -65,14 +65,14 @@
org.eclipse.jgit.treewalk,
org.eclipse.jgit.api,
javax.swing",
- org.eclipse.jgit.pgm.debug;version="5.13.0";
+ org.eclipse.jgit.pgm.debug;version="6.0.0";
uses:="org.eclipse.jgit.util.io,
org.eclipse.jgit.pgm,
org.eclipse.jetty.servlet",
- org.eclipse.jgit.pgm.internal;version="5.13.0";
+ org.eclipse.jgit.pgm.internal;version="6.0.0";
x-friends:="org.eclipse.jgit.pgm.test,
org.eclipse.jgit.test",
- org.eclipse.jgit.pgm.opt;version="5.13.0";
+ org.eclipse.jgit.pgm.opt;version="6.0.0";
uses:="org.kohsuke.args4j,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
index 90a9659..15203e9 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.13.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.13.0.qualifier";roots="."
+Bundle-Version: 6.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index d0c6995..c28da4d 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.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 ccbed6d..0070730 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.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -20,15 +20,15 @@
org.apache.sshd.core;version="[2.6.0,2.7.0)",
org.apache.sshd.server;version="[2.6.0,2.7.0)",
org.apache.sshd.server.forward;version="[2.6.0,2.7.0)",
- org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.junit.ssh;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport.sshd;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit.ssh;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.sshd;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.experimental.theories;version="[4.13,5.0.0)",
org.junit.runner;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml
index 1fe70fe..994fca1 100644
--- a/org.eclipse.jgit.ssh.apache.test/pom.xml
+++ b/org.eclipse.jgit.ssh.apache.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index 7a1ce6b..89b5133 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.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.13.0";x-internal:=true;
+Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.0.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.13.0";x-internal:=true,
- org.eclipse.jgit.internal.transport.sshd.proxy;version="5.13.0";x-friends:="org.eclipse.jgit.ssh.apache.test",
- org.eclipse.jgit.transport.sshd;version="5.13.0";
+ org.eclipse.jgit.internal.transport.sshd.auth;version="6.0.0";x-internal:=true,
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="6.0.0";x-friends:="org.eclipse.jgit.ssh.apache.test",
+ org.eclipse.jgit.transport.sshd;version="6.0.0";
uses:="org.eclipse.jgit.transport,
org.apache.sshd.client.config.hosts,
org.apache.sshd.common.keyprovider,
@@ -80,12 +80,12 @@
org.apache.sshd.sftp;version="[2.6.0,2.7.0)",
org.apache.sshd.sftp.client;version="[2.6.0,2.7.0)",
org.apache.sshd.sftp.common;version="[2.6.0,2.7.0)",
- org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.fnmatch;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.fnmatch;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.nls;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.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 ded7d99..f4eac25 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.13.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.13.0.qualifier";roots="."
+Bundle-Version: 6.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml
index d37cd48..6027a20 100644
--- a/org.eclipse.jgit.ssh.apache/pom.xml
+++ b/org.eclipse.jgit.ssh.apache/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
index 276ba5d..9ab1652 100644
--- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
@@ -3,17 +3,17 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test
Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test
-Bundle-Version: 5.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)",
- org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.junit.ssh;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit.ssh;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.experimental.theories;version="[4.13,5.0.0)",
org.junit.runner;version="[4.13,5.0.0)"
diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml
index 332006e..a890e96 100644
--- a/org.eclipse.jgit.ssh.jsch.test/pom.xml
+++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.jsch.test</artifactId>
diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
index 1391a7e..8cf906f 100644
--- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
@@ -3,24 +3,24 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.ssh.jsch
Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true
-Fragment-Host: org.eclipse.jgit;bundle-version="[5.13.0,5.14.0)"
+Fragment-Host: org.eclipse.jgit;bundle-version="[6.0.0,6.1.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
-Bundle-Version: 5.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.13.0";x-friends:="org.eclipse.egit.core",
- org.eclipse.jgit.transport;version="5.13.0";
+Export-Package: org.eclipse.jgit.internal.transport.jsch;version="6.0.0";x-friends:="org.eclipse.egit.core",
+ org.eclipse.jgit.transport;version="6.0.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.internal.transport.ssh,
org.eclipse.jgit.util,
com.jcraft.jsch"
Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)",
- org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.nls;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util.io;version="[6.0.0,6.1.0)",
org.slf4j;version="[1.7.0,2.0.0)"
diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF
index 26d1b10..5d1f9a3 100644
--- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@
Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources
Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 5.13.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.13.0.qualifier";roots="."
+Bundle-Version: 6.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml
index 813c2dc..95a20b5 100644
--- a/org.eclipse.jgit.ssh.jsch/pom.xml
+++ b/org.eclipse.jgit.ssh.jsch/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index 2cc7681..ca6c587 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.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -16,59 +16,59 @@
org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)",
org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)",
org.assertj.core.api;version="[3.14.0,4.0.0)",
- org.eclipse.jgit.annotations;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.api;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.api.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.archive;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.attributes;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.awtui;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.blame;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.diff;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.dircache;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.events;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.fnmatch;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.gitrepo;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.hooks;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.ignore;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.ignore.internal;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.fsck;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.revwalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.io;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.pack;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.transport.connectivity;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.transport.http;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.internal.transport.parser;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.junit;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.junit.time;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lfs;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib.internal;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.logging;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.merge;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.notes;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.patch;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.pgm;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.pgm.internal;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revplot;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.storage.file;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.storage.pack;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.submodule;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport.http;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport.resolver;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util.sha1;version="[5.13.0,5.14.0)",
+ org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.archive;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.attributes;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.awtui;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.blame;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.diff;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.dircache;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.events;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.fnmatch;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.gitrepo;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.hooks;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.ignore;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.ignore.internal;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.fsck;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.io;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.transport.connectivity;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.transport.http;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit.time;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib.internal;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.logging;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.merge;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.nls;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.notes;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.patch;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.pgm;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.pgm.internal;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revplot;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk.filter;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.storage.pack;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.submodule;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.http;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util.io;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util.sha1;version="[6.0.0,6.1.0)",
org.junit;version="[4.13,5.0.0)",
org.junit.experimental.theories;version="[4.13,5.0.0)",
org.junit.function;version="[4.13.0,5.0.0)",
diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml
index 21236fb..345e3a4 100644
--- a/org.eclipse.jgit.test/pom.xml
+++ b/org.eclipse.jgit.test/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.test</artifactId>
diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index be2e2b0..2fefe55 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.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.jgit.awtui;version="5.13.0"
-Import-Package: org.eclipse.jgit.errors;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.nls;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revplot;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.0,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.0,5.14.0)"
+Export-Package: org.eclipse.jgit.awtui;version="6.0.0"
+Import-Package: org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.nls;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revplot;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)"
diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF
index 3badd8a..df2ffdf 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.13.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.13.0.qualifier";roots="."
+Bundle-Version: 6.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml
index 6ac0437..139c7d8 100644
--- a/org.eclipse.jgit.ui/pom.xml
+++ b/org.eclipse.jgit.ui/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ui</artifactId>
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 1e7ba91..d755f83 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.13.0.qualifier
+Bundle-Version: 6.0.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Eclipse-ExtensibleAPI: true
-Export-Package: org.eclipse.jgit.annotations;version="5.13.0",
- org.eclipse.jgit.api;version="5.13.0";
+Export-Package: org.eclipse.jgit.annotations;version="6.0.0",
+ org.eclipse.jgit.api;version="6.0.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.notes,
org.eclipse.jgit.dircache,
@@ -23,18 +23,18 @@
org.eclipse.jgit.revwalk.filter,
org.eclipse.jgit.blame,
org.eclipse.jgit.merge",
- org.eclipse.jgit.api.errors;version="5.13.0";
+ org.eclipse.jgit.api.errors;version="6.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.errors",
- org.eclipse.jgit.attributes;version="5.13.0";
+ org.eclipse.jgit.attributes;version="6.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk",
- org.eclipse.jgit.blame;version="5.13.0";
+ org.eclipse.jgit.blame;version="6.0.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.13.0";
+ org.eclipse.jgit.diff;version="6.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.attributes,
org.eclipse.jgit.revwalk,
@@ -42,44 +42,44 @@
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util",
- org.eclipse.jgit.dircache;version="5.13.0";
+ org.eclipse.jgit.dircache;version="6.0.0";
uses:="org.eclipse.jgit.events,
org.eclipse.jgit.lib,
org.eclipse.jgit.attributes,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util",
- org.eclipse.jgit.errors;version="5.13.0";
+ org.eclipse.jgit.errors;version="6.0.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.internal.storage.pack",
- org.eclipse.jgit.events;version="5.13.0";
+ org.eclipse.jgit.events;version="6.0.0";
uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.fnmatch;version="5.13.0",
- org.eclipse.jgit.gitrepo;version="5.13.0";
+ org.eclipse.jgit.fnmatch;version="6.0.0",
+ org.eclipse.jgit.gitrepo;version="6.0.0";
uses:="org.xml.sax.helpers,
org.eclipse.jgit.api,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.xml.sax",
- org.eclipse.jgit.gitrepo.internal;version="5.13.0";x-internal:=true,
- org.eclipse.jgit.hooks;version="5.13.0";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.ignore;version="5.13.0",
- org.eclipse.jgit.ignore.internal;version="5.13.0";
+ org.eclipse.jgit.gitrepo.internal;version="6.0.0";x-internal:=true,
+ org.eclipse.jgit.hooks;version="6.0.0";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.ignore;version="6.0.0",
+ org.eclipse.jgit.ignore.internal;version="6.0.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal;version="5.13.0";
+ org.eclipse.jgit.internal;version="6.0.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.http.test",
- org.eclipse.jgit.internal.fsck;version="5.13.0";
+ org.eclipse.jgit.internal.fsck;version="6.0.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.revwalk;version="5.13.0";
+ org.eclipse.jgit.internal.revwalk;version="6.0.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.storage.dfs;version="5.13.0";
+ org.eclipse.jgit.internal.storage.dfs;version="6.0.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.13.0";
+ org.eclipse.jgit.internal.storage.file;version="6.0.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.junit,
org.eclipse.jgit.junit.http,
@@ -88,31 +88,31 @@
org.eclipse.jgit.pgm,
org.eclipse.jgit.pgm.test,
org.eclipse.jgit.ssh.apache",
- org.eclipse.jgit.internal.storage.io;version="5.13.0";
+ org.eclipse.jgit.internal.storage.io;version="6.0.0";
x-friends:="org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.pack;version="5.13.0";
+ org.eclipse.jgit.internal.storage.pack;version="6.0.0";
x-friends:="org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.reftable;version="5.13.0";
+ org.eclipse.jgit.internal.storage.reftable;version="6.0.0";
x-friends:="org.eclipse.jgit.http.test,
org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.submodule;version="5.13.0";x-internal:=true,
- org.eclipse.jgit.internal.transport.connectivity;version="5.13.0";
+ org.eclipse.jgit.internal.submodule;version="6.0.0";x-internal:=true,
+ org.eclipse.jgit.internal.transport.connectivity;version="6.0.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.http;version="5.13.0";
+ org.eclipse.jgit.internal.transport.http;version="6.0.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.parser;version="5.13.0";
+ org.eclipse.jgit.internal.transport.parser;version="6.0.0";
x-friends:="org.eclipse.jgit.http.server,
org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.ssh;version="5.13.0";
+ org.eclipse.jgit.internal.transport.ssh;version="6.0.0";
x-friends:="org.eclipse.jgit.ssh.apache,
org.eclipse.jgit.ssh.jsch",
- org.eclipse.jgit.lib;version="5.13.0";
+ org.eclipse.jgit.lib;version="6.0.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util.sha1,
org.eclipse.jgit.dircache,
@@ -126,10 +126,10 @@
org.eclipse.jgit.util,
org.eclipse.jgit.submodule,
org.eclipse.jgit.util.time",
- org.eclipse.jgit.lib.internal;version="5.13.0";
+ org.eclipse.jgit.lib.internal;version="6.0.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.logging;version="5.13.0",
- org.eclipse.jgit.merge;version="5.13.0";
+ org.eclipse.jgit.logging;version="6.0.0",
+ org.eclipse.jgit.merge;version="6.0.0";
uses:="org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
@@ -138,40 +138,40 @@
org.eclipse.jgit.util,
org.eclipse.jgit.api,
org.eclipse.jgit.attributes",
- org.eclipse.jgit.nls;version="5.13.0",
- org.eclipse.jgit.notes;version="5.13.0";
+ org.eclipse.jgit.nls;version="6.0.0",
+ org.eclipse.jgit.notes;version="6.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.merge",
- org.eclipse.jgit.patch;version="5.13.0";
+ org.eclipse.jgit.patch;version="6.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.diff",
- org.eclipse.jgit.revplot;version="5.13.0";
+ org.eclipse.jgit.revplot;version="6.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk",
- org.eclipse.jgit.revwalk;version="5.13.0";
+ org.eclipse.jgit.revwalk;version="6.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.diff,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.revwalk.filter,
org.eclipse.jgit.treewalk",
- org.eclipse.jgit.revwalk.filter;version="5.13.0";
+ org.eclipse.jgit.revwalk.filter;version="6.0.0";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.lib,
org.eclipse.jgit.util",
- org.eclipse.jgit.storage.file;version="5.13.0";
+ org.eclipse.jgit.storage.file;version="6.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.util",
- org.eclipse.jgit.storage.pack;version="5.13.0";
+ org.eclipse.jgit.storage.pack;version="6.0.0";
uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.submodule;version="5.13.0";
+ org.eclipse.jgit.submodule;version="6.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.diff,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util",
- org.eclipse.jgit.transport;version="5.13.0";
+ org.eclipse.jgit.transport;version="6.0.0";
uses:="javax.crypto,
org.eclipse.jgit.util.io,
org.eclipse.jgit.lib,
@@ -184,21 +184,21 @@
org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.storage.pack,
org.eclipse.jgit.errors",
- org.eclipse.jgit.transport.http;version="5.13.0";
+ org.eclipse.jgit.transport.http;version="6.0.0";
uses:="javax.net.ssl",
- org.eclipse.jgit.transport.resolver;version="5.13.0";
+ org.eclipse.jgit.transport.resolver;version="6.0.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.lib",
- org.eclipse.jgit.treewalk;version="5.13.0";
+ org.eclipse.jgit.treewalk;version="6.0.0";
uses:="org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.attributes,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util",
- org.eclipse.jgit.treewalk.filter;version="5.13.0";
+ org.eclipse.jgit.treewalk.filter;version="6.0.0";
uses:="org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util;version="5.13.0";
+ org.eclipse.jgit.util;version="6.0.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.hooks,
org.eclipse.jgit.revwalk,
@@ -211,12 +211,12 @@
org.eclipse.jgit.treewalk,
javax.net.ssl,
org.eclipse.jgit.util.time",
- org.eclipse.jgit.util.io;version="5.13.0";
+ org.eclipse.jgit.util.io;version="6.0.0";
uses:="org.eclipse.jgit.attributes,
org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util.sha1;version="5.13.0",
- org.eclipse.jgit.util.time;version="5.13.0"
+ org.eclipse.jgit.util.sha1;version="6.0.0",
+ org.eclipse.jgit.util.time;version="6.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
javax.crypto,
diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
index 34d6954..134cbac 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.13.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit;version="5.13.0.qualifier";roots="."
+Bundle-Version: 6.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit;version="6.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index 5adaea7..1ab15be 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit</artifactId>
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
index 7ec36af..37f1d48 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
@@ -1046,10 +1046,12 @@
* @param credentialsProvider
* the provider to use when querying for credentials (eg., during
* signing)
- * @since 5.3
+ * @return {@code this}
+ * @since 6.0
*/
- public void setCredentialsProvider(
+ public CommitCommand setCredentialsProvider(
CredentialsProvider credentialsProvider) {
this.credentialsProvider = credentialsProvider;
+ return this;
}
}
diff --git a/pom.xml b/pom.xml
index 226c7c7..000be66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<packaging>pom</packaging>
- <version>5.13.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<name>JGit - Parent</name>
<url>${jgit-url}</url>
@@ -168,7 +168,7 @@
<httpcore-version>4.4.14</httpcore-version>
<slf4j-version>1.7.30</slf4j-version>
<log4j-version>1.2.15</log4j-version>
- <maven-javadoc-plugin-version>3.3.0</maven-javadoc-plugin-version>
+ <maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version>
<tycho-extras-version>1.7.0</tycho-extras-version>
<gson-version>2.8.6</gson-version>
<bouncycastle-version>1.65</bouncycastle-version>
@@ -202,14 +202,6 @@
<id>repo.eclipse.org.cbi-snapshots</id>
<url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</url>
</pluginRepository>
- <pluginRepository>
- <id>repo.eclipse.org.dash-releases</id>
- <url>https://repo.eclipse.org/content/repositories/dash-licenses-releases/</url>
- </pluginRepository>
- <pluginRepository>
- <id>repo.eclipse.org.dash-snapshots</id>
- <url>https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/</url>
- </pluginRepository>
</pluginRepositories>
<build>
@@ -330,7 +322,7 @@
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
- <version>1.3.1</version>
+ <version>1.1.7</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
@@ -399,11 +391,6 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.4.4</version>
</plugin>
- <plugin>
- <groupId>org.eclipse.dash</groupId>
- <artifactId>license-tool-plugin</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </plugin>
</plugins>
</pluginManagement>
@@ -562,10 +549,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.eclipse.dash</groupId>
- <artifactId>license-tool-plugin</artifactId>
- </plugin>
</plugins>
</build>
@@ -831,41 +814,54 @@
<encoding>UTF-8</encoding>
<source>1.8</source>
<target>1.8</target>
- <compilerArgs>
- <arg>-XDcompilePolicy=simple</arg>
- <arg>-Xplugin:ErrorProne</arg>
- </compilerArgs>
- <annotationProcessorPaths>
- <path>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
- <version>2.4.0</version>
- </path>
- </annotationProcessorPaths>
</configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>jdk8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <properties>
- <javac.version>9+181-r4173-1</javac.version>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <fork>true</fork>
- <compilerArgs combine.children="append">
- <arg>-J-Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/${javac.version}/javac-${javac.version}.jar</arg>
- </compilerArgs>
- </configuration>
+ <executions>
+ <execution>
+ <id>default-compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>org/eclipse/jgit/transport/InsecureCipherFactory.java</include>
+ </includes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>compile-with-errorprone</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <compilerId>javac-with-errorprone</compilerId>
+ <forceJavacCompilerUse>true</forceJavacCompilerUse>
+ <excludes>
+ <exclude>org/eclipse/jgit/transport/InsecureCipherFactory.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-javac</artifactId>
+ <version>${plexus-compiler-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-javac-errorprone</artifactId>
+ <version>${plexus-compiler-version}</version>
+ </dependency>
+ <!-- override plexus-compiler-javac-errorprone's dependency on
+ Error Prone with the latest version -->
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ <version>2.3.4</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
