diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 8c361c58e..96edc2c07 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 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 5.13.1.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.1,5.14.0)", - org.eclipse.jgit.junit;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,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,3.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 39736cd0f..effb8d494 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 050b6f2c0..011847685 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 5.13.1.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.1,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.1", - org.eclipse.jgit.ant.tasks;version="5.13.1"; +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 455ecceb7..7ab4b3e0a 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.13.1.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 b9c760a7d..ae4b52d73 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index af714cb43..1441f62e1 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 5.13.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -13,17 +13,17 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", 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.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.nls;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,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.1"; +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.1";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 8860bfe86..7322fd082 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.13.1.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 ea6f0fe10..7dbd8c727 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 1c1d015f5..0bacf67bc 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.jgit - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.benchmarks jar @@ -70,13 +70,47 @@ + org.apache.maven.plugins maven-compiler-plugin + 3.8.1 - UTF-8 - 1.8 - 1.8 + ${javac.target} + ${javac.target} + ${javac.target} .apt_generated + + + compile-with-errorprone + compile + + compile + + + javac-with-errorprone + true + + + + + + org.codehaus.plexus + plexus-compiler-javac + 2.8.5 + + + org.codehaus.plexus + plexus-compiler-javac-errorprone + 2.8.5 + + + + com.google.errorprone + error_prone_core + 2.3.4 + + org.apache.maven.plugins @@ -165,7 +199,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.2 + 3.1.1 diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index b9a1614b6..056648aca 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT 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 3357867f1..d46365b8d 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-ManifestVersion: 2 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.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -12,9 +12,9 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)", 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.1,5.14.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util.sha1;version="[5.13.1,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.hamcrest;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;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 a47b47f59..aa09d3f00 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 324a07902..22622aec9 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-ManifestVersion: 2 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.1,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.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.cryptlib;version="[1.69.0,2.0.0)", @@ -29,9 +29,9 @@ Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.util;version="[1.69.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)", org.bouncycastle.util.io;version="[1.69.0,2.0.0)", - org.eclipse.jgit.annotations;version="[5.13.1,5.14.0)", - org.eclipse.jgit.api.errors;version="[5.13.1,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.1", - org.eclipse.jgit.gpg.bc.internal;version="5.13.1";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="5.13.1";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 073d46697..9e0d921ea 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 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.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.13.1.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 e7063a66a..47d3e9b63 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index d80abe485..0f2d7a3b6 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-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 5.13.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor @@ -25,11 +25,11 @@ Import-Package: org.apache.http;version="[4.3.0,5.0.0)", 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.1,5.14.0)", - org.eclipse.jgit.nls;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport.http;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,5.14.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="5.13.1"; + 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 3cab0d7a8..1b04dca5e 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-ManifestVersion: 2 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.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.13.1.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 fa369ec00..9b5e626e8 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 08d6aa729..fe18cafce 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-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 5.13.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="5.13.1", - org.eclipse.jgit.http.server.glue;version="5.13.1"; +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.1"; + 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-ActivationPolicy: lazy 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.1,5.14.0)", - org.eclipse.jgit.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.transport.parser;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.nls;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport.resolver;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,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 bc03ec6b9..70181b6bc 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-ManifestVersion: 2 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.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.13.1.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 c2f7165a2..f0935c32d 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 681123bbe..0df7dd325 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-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 5.13.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -28,26 +28,26 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", 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.1,5.14.0)", - org.eclipse.jgit.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.http.server;version="[5.13.1,5.14.0)", - org.eclipse.jgit.http.server.glue;version="[5.13.1,5.14.0)", - org.eclipse.jgit.http.server.resolver;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.13.1,5.14.0)", - org.eclipse.jgit.junit;version="[5.13.1,5.14.0)", - org.eclipse.jgit.junit.http;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.nls;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport.http;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport.http.apache;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport.resolver;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,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,3.0.0)", org.hamcrest.core;version="[1.1.0,3.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 06d7adb61..210a49695 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 981fda70b..742b3dd8d 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-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 5.13.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -22,16 +22,16 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", 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.1,5.14.0)", - org.eclipse.jgit.http.server;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.junit;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport.resolver;version="[5.13.1,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.1"; +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 858d80af0..e24f9e44a 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-ManifestVersion: 2 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.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.13.1.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 b4456a0e4..6d4038e29 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 144ef3463..9d6b491c2 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-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 5.13.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.7.0,2.8.0)", org.apache.sshd.server.subsystem;version="[2.7.0,2.8.0)", org.apache.sshd.sftp;version="[2.7.0,2.8.0)", org.apache.sshd.sftp.server;version="[2.7.0,2.8.0)", - org.eclipse.jgit.annotations;version="[5.13.1,5.14.0)", - org.eclipse.jgit.api;version="[5.13.1,5.14.0)", - org.eclipse.jgit.api.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.junit;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,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.1" +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 bd25566ac..e0c30ff48 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-ManifestVersion: 2 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.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.13.1.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 caaf44456..a6f466016 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 2be2c437f..90fbfd8e5 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,35 +3,35 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 5.13.1.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.1,5.14.0)", - org.eclipse.jgit.api;version="[5.13.1,5.14.0)", - org.eclipse.jgit.api.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.dircache;version="[5.13.1,5.14.0)", - org.eclipse.jgit.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.merge;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport;version="5.13.1", - org.eclipse.jgit.treewalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.treewalk.filter;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util.io;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util.time;version="[5.13.1,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.1"; +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 @@ Export-Package: org.eclipse.jgit.junit;version="5.13.1"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="5.13.1";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 71be53e26..f2b1b25bf 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-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.13.1.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 9ac036a73..aa411bf5d 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.junit 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 44e1fb206..fa689b0d7 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-ManifestVersion: 2 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.1.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 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", 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.1,5.14.0)", - org.eclipse.jgit.api.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.junit;version="[5.13.1,5.14.0)", - org.eclipse.jgit.junit.http;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs.server;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs.test;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport;version="[5.13.1,5.14.0)", - org.eclipse.jgit.treewalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.treewalk.filter;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,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,3.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 535ac09ea..2c1b13429 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index d52c2eb6e..76050e117 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-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 5.13.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="5.13.1"; +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.1"; + 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.1";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="5.13.1"; + 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 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", 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.1,5.14.0)", - org.eclipse.jgit.internal;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs.internal;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.nls;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport.http;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport.http.apache;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,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 e140969b3..c36373e29 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-ManifestVersion: 2 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.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.13.1.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 5981c8b7d..948c65a43 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 5dc19ff64..ac8552197 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-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 5.13.1.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.1,5.14.0)", - org.eclipse.jgit.attributes;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.13.1,5.14.0)", - org.eclipse.jgit.junit;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.treewalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.treewalk.filter;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,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,3.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.1";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 04835b23f..262258c2d 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 00de6ae23..3eb5a7671 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 5.13.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="5.13.1", - org.eclipse.jgit.lfs.errors;version="5.13.1", - org.eclipse.jgit.lfs.internal;version="5.13.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="5.13.1" +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.1,5.14.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.attributes;version="[5.13.1,5.14.0)", - org.eclipse.jgit.diff;version="[5.13.1,5.14.0)", - org.eclipse.jgit.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.hooks;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.nls;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.storage.pack;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport.http;version="[5.13.1,5.14.0)", - org.eclipse.jgit.treewalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.treewalk.filter;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util.io;version="[5.13.1,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 5b4920723..5d14b1cd5 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-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.13.1.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 996aa079c..e1063e1f4 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.lfs 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 602c70fee..526e8b331 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 @@ 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 f7c4bcd59..276401cc5 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 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.feature 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 416b4f548..6883afc34 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 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.feature 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 631631a24..22f995e8d 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 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.feature 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 7df361ff6..65b70d5d0 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 @@ @@ -24,7 +24,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.feature 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 317b5dbac..4b5032e45 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 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.feature 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 d6c37cb64..d97ce7552 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 @@ @@ -35,9 +35,9 @@ version="0.0.0"/> - - - + + + org.eclipse.jgit jgit.tycho.parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.feature 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 2d2b0cdb6..f36717e95 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 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.repository 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 0df2bc316..eb0a658e5 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 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT 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 7b66264d3..46ea77995 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 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.feature 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 4e63311f6..06a6ed91e 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 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.feature 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 d7f05cbac..ccd730fa4 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 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 5.13.1.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 faf251973..1660e08df 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 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index b65066e39..f3287f1b8 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 0ff337fa6..52b59a370 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-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 5.13.1.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.1,5.14.0)", - org.eclipse.jgit.api.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.diff;version="[5.13.1,5.14.0)", - org.eclipse.jgit.dircache;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.file;version="5.13.1", - org.eclipse.jgit.junit;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.merge;version="[5.13.1,5.14.0)", - org.eclipse.jgit.pgm;version="[5.13.1,5.14.0)", - org.eclipse.jgit.pgm.internal;version="[5.13.1,5.14.0)", - org.eclipse.jgit.pgm.opt;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport;version="[5.13.1,5.14.0)", - org.eclipse.jgit.treewalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util.io;version="[5.13.1,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="[2.2.0,3.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 3c0571458..85f96c597 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index f35d58c0f..c56224e3a 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 5.13.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -14,46 +14,46 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)", org.eclipse.jetty.util;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)", - org.eclipse.jgit.api;version="[5.13.1,5.14.0)", - org.eclipse.jgit.api.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.archive;version="[5.13.1,5.14.0)", - org.eclipse.jgit.awtui;version="[5.13.1,5.14.0)", - org.eclipse.jgit.blame;version="[5.13.1,5.14.0)", - org.eclipse.jgit.diff;version="[5.13.1,5.14.0)", - org.eclipse.jgit.dircache;version="[5.13.1,5.14.0)", - org.eclipse.jgit.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.gitrepo;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.io;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs.server;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs.server.s3;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.merge;version="[5.13.1,5.14.0)", - org.eclipse.jgit.nls;version="[5.13.1,5.14.0)", - org.eclipse.jgit.notes;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revplot;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revwalk.filter;version="[5.13.1,5.14.0)", - org.eclipse.jgit.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.storage.pack;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport.http.apache;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport.resolver;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport.sshd;version="[5.13.1,5.14.0)", - org.eclipse.jgit.treewalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.treewalk.filter;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util.io;version="[5.13.1,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.1"; +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.1"; + 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 @@ Export-Package: org.eclipse.jgit.console;version="5.13.1"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="5.13.1"; + 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.1"; + 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.1"; + 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 33eea5952..15203e9ae 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.13.1.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 f8ec120ce..c28da4d7f 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.pgm 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 994540dd7..1b885af92 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-ManifestVersion: 2 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.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -21,15 +21,15 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)", org.apache.sshd.core;version="[2.7.0,2.8.0)", org.apache.sshd.server;version="[2.7.0,2.8.0)", org.apache.sshd.server.forward;version="[2.7.0,2.8.0)", - org.eclipse.jgit.api;version="[5.13.1,5.14.0)", - org.eclipse.jgit.api.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.13.1,5.14.0)", - org.eclipse.jgit.junit;version="[5.13.1,5.14.0)", - org.eclipse.jgit.junit.ssh;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport.sshd;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,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.hamcrest;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;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 d89866ecd..994fca1fc 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index f423c74f9..03b046271 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-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 5.13.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.13.1";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 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.13.1";x-inte 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.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="5.13.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.transport.sshd;version="5.13.1"; + 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 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.sftp;version="[2.7.0,2.8.0)", org.apache.sshd.sftp.client;version="[2.7.0,2.8.0)", org.apache.sshd.sftp.common;version="[2.7.0,2.8.0)", - org.eclipse.jgit.annotations;version="[5.13.1,5.14.0)", - org.eclipse.jgit.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.fnmatch;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.transport.ssh;version="[5.13.1,5.14.0)", - org.eclipse.jgit.nls;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,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 272a43a67..f4eac25e0 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-ManifestVersion: 2 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.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.13.1.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 ee1667634..6027a2095 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache 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 8472db4d0..b5ad6808d 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-ManifestVersion: 2 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.1.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.1,5.14.0)", - org.eclipse.jgit.junit;version="[5.13.1,5.14.0)", - org.eclipse.jgit.junit.ssh;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,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.hamcrest;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;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 6e36ce39b..a890e96c4 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index e7df02daf..8cf906f26 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-ManifestVersion: 2 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.1,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.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.13.1";x-friends:="org.eclipse.egit.core", - org.eclipse.jgit.transport;version="5.13.1"; +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.1,5.14.0)", - org.eclipse.jgit.internal;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.transport.ssh;version="[5.13.1,5.14.0)", - org.eclipse.jgit.nls;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util.io;version="[5.13.1,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 badaaeb0f..5d1f9a333 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-ManifestVersion: 2 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.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.13.1.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 7f8ec15bf..95a20b50a 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 8a0babdb8..4facbfc44 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 5.13.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -16,59 +16,59 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", 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.1,5.14.0)", - org.eclipse.jgit.api;version="[5.13.1,5.14.0)", - org.eclipse.jgit.api.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.archive;version="[5.13.1,5.14.0)", - org.eclipse.jgit.attributes;version="[5.13.1,5.14.0)", - org.eclipse.jgit.awtui;version="[5.13.1,5.14.0)", - org.eclipse.jgit.blame;version="[5.13.1,5.14.0)", - org.eclipse.jgit.diff;version="[5.13.1,5.14.0)", - org.eclipse.jgit.dircache;version="[5.13.1,5.14.0)", - org.eclipse.jgit.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.events;version="[5.13.1,5.14.0)", - org.eclipse.jgit.fnmatch;version="[5.13.1,5.14.0)", - org.eclipse.jgit.gitrepo;version="[5.13.1,5.14.0)", - org.eclipse.jgit.hooks;version="[5.13.1,5.14.0)", - org.eclipse.jgit.ignore;version="[5.13.1,5.14.0)", - org.eclipse.jgit.ignore.internal;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.fsck;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.revwalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.io;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.transport.http;version="[5.13.1,5.14.0)", - org.eclipse.jgit.internal.transport.parser;version="[5.13.1,5.14.0)", - org.eclipse.jgit.junit;version="[5.13.1,5.14.0)", - org.eclipse.jgit.junit.time;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lfs;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib.internal;version="[5.13.1,5.14.0)", - org.eclipse.jgit.logging;version="[5.13.1,5.14.0)", - org.eclipse.jgit.merge;version="[5.13.1,5.14.0)", - org.eclipse.jgit.nls;version="[5.13.1,5.14.0)", - org.eclipse.jgit.notes;version="[5.13.1,5.14.0)", - org.eclipse.jgit.patch;version="[5.13.1,5.14.0)", - org.eclipse.jgit.pgm;version="[5.13.1,5.14.0)", - org.eclipse.jgit.pgm.internal;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revplot;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revwalk.filter;version="[5.13.1,5.14.0)", - org.eclipse.jgit.storage.file;version="[5.13.1,5.14.0)", - org.eclipse.jgit.storage.pack;version="[5.13.1,5.14.0)", - org.eclipse.jgit.submodule;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport.http;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport.resolver;version="[5.13.1,5.14.0)", - org.eclipse.jgit.treewalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.treewalk.filter;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util.io;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util.sha1;version="[5.13.1,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.hamcrest;version="[1.1.0,3.0.0)", org.hamcrest.collection;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index ddd1b7e05..fd581fcab 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 4fd5a0725..2fefe551a 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 5.13.1.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.1" -Import-Package: org.eclipse.jgit.errors;version="[5.13.1,5.14.0)", - org.eclipse.jgit.lib;version="[5.13.1,5.14.0)", - org.eclipse.jgit.nls;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revplot;version="[5.13.1,5.14.0)", - org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)", - org.eclipse.jgit.transport;version="[5.13.1,5.14.0)", - org.eclipse.jgit.util;version="[5.13.1,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 2619e212d..df2ffdfc3 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-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.13.1.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 b080c5fbb..139c7d824 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 41a5fbf9f..d755f8362 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 5.13.1.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.1", - org.eclipse.jgit.api;version="5.13.1"; +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 @@ Export-Package: org.eclipse.jgit.annotations;version="5.13.1", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="5.13.1"; + 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.1"; + org.eclipse.jgit.attributes;version="6.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="5.13.1"; + 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.1"; + 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 @@ Export-Package: org.eclipse.jgit.annotations;version="5.13.1", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="5.13.1"; + 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.1"; + 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.1"; + org.eclipse.jgit.events;version="6.0.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="5.13.1", - org.eclipse.jgit.gitrepo;version="5.13.1"; + 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.1";x-internal:=true, - org.eclipse.jgit.hooks;version="5.13.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="5.13.1", - org.eclipse.jgit.ignore.internal;version="5.13.1"; + 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.1"; + 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.1"; + org.eclipse.jgit.internal.fsck;version="6.0.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="5.13.1"; + org.eclipse.jgit.internal.revwalk;version="6.0.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="5.13.1"; + 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.1"; + 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 @@ Export-Package: org.eclipse.jgit.annotations;version="5.13.1", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="5.13.1"; + 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.1"; + 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.1"; + 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.1";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="5.13.1"; + 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.1"; + 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.1"; + 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.1"; + 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.1"; + 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 @@ Export-Package: org.eclipse.jgit.annotations;version="5.13.1", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="5.13.1"; + org.eclipse.jgit.lib.internal;version="6.0.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.logging;version="5.13.1", - org.eclipse.jgit.merge;version="5.13.1"; + 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 @@ Export-Package: org.eclipse.jgit.annotations;version="5.13.1", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="5.13.1", - org.eclipse.jgit.notes;version="5.13.1"; + 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.1"; + org.eclipse.jgit.patch;version="6.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="5.13.1"; + org.eclipse.jgit.revplot;version="6.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="5.13.1"; + 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.1"; + 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.1"; + 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.1"; + org.eclipse.jgit.storage.pack;version="6.0.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="5.13.1"; + 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.1"; + org.eclipse.jgit.transport;version="6.0.0"; uses:="javax.crypto, org.eclipse.jgit.util.io, org.eclipse.jgit.lib, @@ -184,21 +184,21 @@ Export-Package: org.eclipse.jgit.annotations;version="5.13.1", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="5.13.1"; + org.eclipse.jgit.transport.http;version="6.0.0"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="5.13.1"; + 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.1"; + 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.1"; + org.eclipse.jgit.treewalk.filter;version="6.0.0"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="5.13.1"; + 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 @@ Export-Package: org.eclipse.jgit.annotations;version="5.13.1", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="5.13.1"; + 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.1", - org.eclipse.jgit.util.time;version="5.13.1" + 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 efca93c0a..134cbacbe 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="5.13.1.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 c4b44d493..1ab15bece 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.jgit 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 7ec36af71..37f1d482a 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 @@ public CommitCommand setGpgConfig(GpgConfig config) { * @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 ef528c699..80f693db8 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.13.1-SNAPSHOT + 6.0.0-SNAPSHOT JGit - Parent ${jgit-url} @@ -168,7 +168,7 @@ 4.4.14 1.7.30 1.2.15 - 3.3.0 + 3.2.0 1.7.0 2.8.7 1.69 @@ -204,14 +204,6 @@ repo.eclipse.org.cbi-snapshots https://repo.eclipse.org/content/repositories/cbi-snapshots/ - - repo.eclipse.org.dash-releases - https://repo.eclipse.org/content/repositories/dash-licenses-releases/ - - - repo.eclipse.org.dash-snapshots - https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/ - @@ -332,7 +324,7 @@ org.eclipse.cbi.maven.plugins eclipse-jarsigner-plugin - 1.3.1 + 1.1.7 org.eclipse.tycho.extras @@ -401,11 +393,6 @@ spring-boot-maven-plugin 2.4.4 - - org.eclipse.dash - license-tool-plugin - 0.0.1-SNAPSHOT - @@ -564,10 +551,6 @@ org.apache.maven.plugins maven-surefire-report-plugin - - org.eclipse.dash - license-tool-plugin - @@ -839,41 +822,54 @@ UTF-8 1.8 1.8 - - -XDcompilePolicy=simple - -Xplugin:ErrorProne - - - - com.google.errorprone - error_prone_core - 2.4.0 - - - - - - - - - jdk8 - - 1.8 - - - 9+181-r4173-1 - - - - - org.apache.maven.plugins - maven-compiler-plugin - - true - - -J-Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/${javac.version}/javac-${javac.version}.jar - + + + default-compile + compile + + compile + + + + org/eclipse/jgit/transport/InsecureCipherFactory.java + + + + + compile-with-errorprone + compile + + compile + + + javac-with-errorprone + true + + org/eclipse/jgit/transport/InsecureCipherFactory.java + + + + + + + org.codehaus.plexus + plexus-compiler-javac + ${plexus-compiler-version} + + + org.codehaus.plexus + plexus-compiler-javac-errorprone + ${plexus-compiler-version} + + + + com.google.errorprone + error_prone_core + 2.3.4 + +