diff options
111 files changed, 1196 insertions, 988 deletions
diff --git a/DEPENDENCIES b/DEPENDENCIES index bffe3d9282..9dbca62b06 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -12,8 +12,8 @@ maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.9.0, Apache-2.0, approved, c maven/mavencentral/net.bytebuddy/byte-buddy/1.9.0, Apache-2.0, approved, clearlydefined maven/mavencentral/net.i2p.crypto/eddsa/0.3.0, CC0, approved, CQ17804 maven/mavencentral/net.sf.jopt-simple/jopt-simple/4.6, MIT, approved, clearlydefined -maven/mavencentral/org.apache.ant/ant-launcher/1.10.8, Apache-2.0 AND W3C AND LicenseRef-Public-Domain, approved, CQ15560 -maven/mavencentral/org.apache.ant/ant/1.10.8, Apache-2.0 AND W3C AND LicenseRef-Public-Domain, approved, CQ15560 +maven/mavencentral/org.apache.ant/ant-launcher/1.10.10, Apache-2.0 AND W3C AND LicenseRef-Public-Domain, approved, CQ15560 +maven/mavencentral/org.apache.ant/ant/1.10.10, Apache-2.0 AND W3C AND LicenseRef-Public-Domain, approved, CQ15560 maven/mavencentral/org.apache.commons/commons-compress/1.19, Apache-2.0, approved, clearlydefined maven/mavencentral/org.apache.commons/commons-math3/3.2, Apache-2.0, approved, clearlydefined maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.13, Apache-2.0, approved, CQ22761 @@ -26,35 +26,35 @@ maven/mavencentral/org.assertj/assertj-core/3.14.0, Apache-2.0, approved, clearl maven/mavencentral/org.bouncycastle/bcpg-jdk15on/1.65, Apache-2.0, approved, CQ21975 maven/mavencentral/org.bouncycastle/bcpkix-jdk15on/1.65, MIT AND LicenseRef-Public-Domain, approved, CQ21976 maven/mavencentral/org.bouncycastle/bcprov-jdk15on/1.65.01, MIT AND LicenseRef-Public-Domain, approved, CQ21977 -maven/mavencentral/org.eclipse.jetty/jetty-http/9.4.36.v20210114, , approved, eclipse -maven/mavencentral/org.eclipse.jetty/jetty-io/9.4.36.v20210114, , approved, eclipse -maven/mavencentral/org.eclipse.jetty/jetty-security/9.4.36.v20210114, , approved, eclipse -maven/mavencentral/org.eclipse.jetty/jetty-server/9.4.36.v20210114, , approved, eclipse -maven/mavencentral/org.eclipse.jetty/jetty-servlet/9.4.36.v20210114, , approved, eclipse -maven/mavencentral/org.eclipse.jetty/jetty-util-ajax/9.4.36.v20210114, , approved, eclipse -maven/mavencentral/org.eclipse.jetty/jetty-util/9.4.36.v20210114, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant.test/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.archive/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.gpg.bc/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.apache/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.server/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.test/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.http/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.ssh/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server.test/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.test/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm.test/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache.test/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.jsch/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.test/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ui/5.11.0-SNAPSHOT, , approved, eclipse -maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit/5.11.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jetty/jetty-http/9.4.41.v20210516, , approved, eclipse +maven/mavencentral/org.eclipse.jetty/jetty-io/9.4.41.v20210516, , approved, eclipse +maven/mavencentral/org.eclipse.jetty/jetty-security/9.4.41.v20210516, , approved, eclipse +maven/mavencentral/org.eclipse.jetty/jetty-server/9.4.41.v20210516, , approved, eclipse +maven/mavencentral/org.eclipse.jetty/jetty-servlet/9.4.41.v20210516, , approved, eclipse +maven/mavencentral/org.eclipse.jetty/jetty-util-ajax/9.4.41.v20210516, , approved, eclipse +maven/mavencentral/org.eclipse.jetty/jetty-util/9.4.41.v20210516, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant.test/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ant/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.archive/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.gpg.bc/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.apache/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.server/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.http.test/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.http/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit.ssh/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.junit/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server.test/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.server/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs.test/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.lfs/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm.test/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.pgm/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache.test/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.apache/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ssh.jsch/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.test/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit.ui/5.12.0-SNAPSHOT, , approved, eclipse +maven/mavencentral/org.eclipse.jgit/org.eclipse.jgit/5.12.0-SNAPSHOT, , approved, eclipse maven/mavencentral/org.hamcrest/hamcrest-core/1.3, BSD-2-Clause, approved, CQ7063 maven/mavencentral/org.mockito/mockito-core/2.23.0, MIT, approved, CQ17976 maven/mavencentral/org.objenesis/objenesis/2.6, Apache-2.0, approved, CQ15478 @@ -237,55 +237,55 @@ maven_jar( sha1 = "9180733b7df8542621dc12e21e87557e8c99b8cb", ) -JETTY_VER = "9.4.40.v20210413" +JETTY_VER = "9.4.41.v20210516" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER, - sha1 = "41abc058d311baae3fe5411223e4108af212a24a", - src_sha1 = "2e5b2319bce4c74d760106db05deed2a405041ce", + sha1 = "ea45368ea7fd04026038f89e6910f17f70939641", + src_sha1 = "4acf6b0d1449ccd39b195783e3639ab0da51f7bf", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "0c2807eff66ca21b565276e69aa8502524beb204", - src_sha1 = "b4873ec0ab5acc8a383df4dc9046ad5361b5616f", + sha1 = "5ba69b1189a9d1f425ed03cbc2c901e0e6023c4d", + src_sha1 = "d46f8cb4dad66751d3a588309c6bbc15b80fbad4", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "a6d22f20c863d2d7669dbc2399a1a3b25b0f8a20", - src_sha1 = "09f789d2959ea38813be6bd2b751bba9db3a4494", + sha1 = "25b1963b0a1c56202ec37046adc55861815107ce", + src_sha1 = "a7f82c9df737316cf0dfafe4a33ca4ae89d780db", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "dea7e5fe28a6580d6900e77d836e650aeecfa9c8", - src_sha1 = "b161959fac6fd932031022ac3fb8b6c34a422feb", + sha1 = "0d460bece4dd9666b46cbd18f8d7fd31cf02ecd9", + src_sha1 = "6fa009d950b8fdab8e94003e6295c08d42ee85b7", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "c420368a360c20b40a57897676d581462d0a54c0", - src_sha1 = "6ae54fba76b91f24ec5880202920f0a61b1b050b", + sha1 = "820eea368623939c2113902b1ca7a98186f64a73", + src_sha1 = "4373285dafb5f79210815d9c15de106cc3e9ac4d", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "1ab1a4f33f293110fdfb3da1911b2a00da78019b", - src_sha1 = "9d537ad9d22c7edfac0e38ba5afc04632716dca5", + sha1 = "548c76ea00d7eb3e2bcea273174e5d030639d109", + src_sha1 = "ba188de552a0c310f69cf12bea887413ce8f0e78", ) maven_jar( name = "jetty-util-ajax", artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER, - sha1 = "62014fb386f1c3dce53029165fd76435bcb8bb6c", - src_sha1 = "99df1bf89bdd11c9caa0e56cc802b949f896e3d9", + sha1 = "d4c1d66fc62796a17548e6c344fbf89b5889f873", + src_sha1 = "b60cf77be68137eee4ee13d83c47d684d14b6d90", ) BOUNCYCASTLE_VER = "1.65" diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 5fc0e9aa67..75451deb0f 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.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[5.12.0,5.13.0)", - org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", + org.eclipse.jgit.ant.tasks;version="[5.12.1,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index f1e01e7b9c..b318fae262 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ant.test</artifactId> diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 812634ee2f..ce257c32bc 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.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)" + org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)" Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="5.12.0", - org.eclipse.jgit.ant.tasks;version="5.12.0"; +Export-Package: org.eclipse.jgit.ant;version="5.12.1", + org.eclipse.jgit.ant.tasks;version="5.12.1"; 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 ee4006afb8..9d9ad0c8e8 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.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 2969d0a6b9..4e4a041798 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ant</artifactId> diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 043241eb54..3c9e5511fe 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.12.0.qualifier +Bundle-Version: 5.12.1.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.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.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.12.0"; +Export-Package: org.eclipse.jgit.archive;version="5.12.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, org.osgi.framework", - org.eclipse.jgit.archive.internal;version="5.12.0";x-internal:=true + org.eclipse.jgit.archive.internal;version="5.12.1";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 e63330e281..54a18ec7a9 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.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 2da96d49b2..b67af49df3 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.archive</artifactId> diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index c394485c9e..dd4b4a9eee 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.jgit</groupId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> <artifactId>org.eclipse.jgit.benchmarks</artifactId> <packaging>jar</packaging> diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 6c42abf779..c84b8f357f 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -27,88 +27,88 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ant</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.archive</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.apache</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.server</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs.server</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.pgm</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ui</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ssh.apache</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.test</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ant.test</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.test</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.pgm.test</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs.test</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs.server.test</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ssh.apache.test</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> </dependencies> diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 0e584f81ce..0c9cee3e4d 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.12.0.qualifier +Bundle-Version: 5.12.1.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.12.0,5.13.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util.sha1;version="[5.12.0,5.13.0)", + org.eclipse.jgit.gpg.bc.internal;version="[5.12.1,5.13.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util.sha1;version="[5.12.1,5.13.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index f55b54a5e1..6ecbc00763 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.gpg.bc.test</artifactId> diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 11aa3fdf54..f1854b0b10 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.12.0,5.13.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[5.12.1,5.13.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Bundle-Version: 5.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.bouncycastle.asn1;version="[1.65.0,2.0.0)", org.bouncycastle.asn1.cryptlib;version="[1.65.0,2.0.0)", @@ -29,9 +29,9 @@ Import-Package: org.bouncycastle.asn1;version="[1.65.0,2.0.0)", org.bouncycastle.util;version="[1.65.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)", org.bouncycastle.util.io;version="[1.65.0,2.0.0)", - org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)", - org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc;version="5.12.0", - org.eclipse.jgit.gpg.bc.internal;version="5.12.0";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="5.12.0";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc;version="5.12.1", + org.eclipse.jgit.gpg.bc.internal;version="5.12.1";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="5.12.1";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 7851004bf4..cd000ba9fa 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.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index d5b7962579..8c78f6e55f 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.gpg.bc</artifactId> diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 3f1068a2ba..69799a9eb8 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.12.0.qualifier +Bundle-Version: 5.12.1.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.12.0,5.13.0)", - org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport.http;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="5.12.0"; + org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport.http;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="5.12.1"; 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 b53fff29a6..0210cf60d4 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.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 7d6cffe30d..b3fb85dc77 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.apache</artifactId> diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index a4bbfd9994..c20a9e0a19 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.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="5.12.0", - org.eclipse.jgit.http.server.glue;version="5.12.0"; +Export-Package: org.eclipse.jgit.http.server;version="5.12.1", + org.eclipse.jgit.http.server.glue;version="5.12.1"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="5.12.0"; + org.eclipse.jgit.http.server.resolver;version="5.12.1"; 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.12.0,5.13.0)", - org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.transport.parser;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)" + org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.transport.parser;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport.resolver;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.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 5ef910dd6b..856f91e0e5 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.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 965d13850b..f14217394f 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.server</artifactId> diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 170595f08a..b8a653d491 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.12.0.qualifier +Bundle-Version: 5.12.1.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.12.0,5.13.0)", - org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.http.server;version="[5.12.0,5.13.0)", - org.eclipse.jgit.http.server.glue;version="[5.12.0,5.13.0)", - org.eclipse.jgit.http.server.resolver;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.12.0,5.13.0)", - org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", - org.eclipse.jgit.junit.http;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport.http;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport.http.apache;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api;version="[5.12.1,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.http.server;version="[5.12.1,5.13.0)", + org.eclipse.jgit.http.server.glue;version="[5.12.1,5.13.0)", + org.eclipse.jgit.http.server.resolver;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.12.1,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.1,5.13.0)", + org.eclipse.jgit.junit.http;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport.http;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport.http.apache;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport.resolver;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 5e3f2d1f41..67b401280a 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.test</artifactId> diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index a170764133..b5e6ff3b4b 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.12.0.qualifier +Bundle-Version: 5.12.1.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.12.0,5.13.0)", - org.eclipse.jgit.http.server;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.http.server;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport.resolver;version="[5.12.1,5.13.0)", org.junit;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="5.12.0"; +Export-Package: org.eclipse.jgit.junit.http;version="5.12.1"; 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 55d08fb2cf..d9204d3d19 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.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 03b16921c9..b155ff3eb1 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit.http</artifactId> diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index b0d87bd89c..b777174c7c 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.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.6.0,2.7.0)", org.apache.sshd.server.subsystem;version="[2.6.0,2.7.0)", org.apache.sshd.sftp;version="[2.6.0,2.7.0)", org.apache.sshd.sftp.server;version="[2.6.0,2.7.0)", - org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)", - org.eclipse.jgit.api;version="[5.12.0,5.13.0)", - org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", + org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)", + org.eclipse.jgit.api;version="[5.12.1,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.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.12.0" +Export-Package: org.eclipse.jgit.junit.ssh;version="5.12.1" 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 9dd564f0aa..eb562a0280 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.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index b73fcf14af..efec5732bd 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit.ssh</artifactId> diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index c9aa1ec3e2..fa61ce23a4 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.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)", - org.eclipse.jgit.api;version="[5.12.0,5.13.0)", - org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.dircache;version="[5.12.0,5.13.0)", - org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.merge;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="5.12.0", - org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util.time;version="[5.12.0,5.13.0)", +Import-Package: org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)", + org.eclipse.jgit.api;version="[5.12.1,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.dircache;version="[5.12.1,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.merge;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="5.12.1", + org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.treewalk.filter;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util.io;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util.time;version="[5.12.1,5.13.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.12.0"; +Export-Package: org.eclipse.jgit.junit;version="5.12.1"; 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.12.0"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="5.12.0";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="5.12.1";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 8e44b877c1..a4b46e4fe0 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.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index f1ad71a044..884abf0019 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit</artifactId> diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index c0fd56e007..296ff9e0eb 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-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.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -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.12.0,5.13.0)", - org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", - org.eclipse.jgit.junit.http;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs.server;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs.test;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", - org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api;version="[5.12.1,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.1,5.13.0)", + org.eclipse.jgit.junit.http;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs.server;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs.test;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.treewalk.filter;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 5d8352cb35..318f74e424 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs.server.test</artifactId> diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 2bf113b775..1596febdde 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.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="5.12.0"; +Export-Package: org.eclipse.jgit.lfs.server;version="5.12.1"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="5.12.0"; + org.eclipse.jgit.lfs.server.fs;version="5.12.1"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="5.12.0";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="5.12.0"; + org.eclipse.jgit.lfs.server.internal;version="5.12.1";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="5.12.1"; 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.12.0,5.13.0)", - org.eclipse.jgit.internal;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs.internal;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport.http;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport.http.apache;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", + org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs.internal;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport.http;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport.http.apache;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.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 38fc66c53c..5e4ae5210a 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.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index cfb0f9fe49..02d70fbd4b 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs.server</artifactId> diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 3626a2f5b6..7399ba1d6e 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.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[5.12.0,5.13.0)", - org.eclipse.jgit.attributes;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.12.0,5.13.0)", - org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", +Import-Package: org.eclipse.jgit.api;version="[5.12.1,5.13.0)", + org.eclipse.jgit.attributes;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.12.1,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.treewalk.filter;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="5.12.0";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="5.12.1";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 1e463b905d..5e58aa583b 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs.test</artifactId> diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 73d3d3c90a..db8247a35b 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.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="5.12.0", - org.eclipse.jgit.lfs.errors;version="5.12.0", - org.eclipse.jgit.lfs.internal;version="5.12.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="5.12.0" +Export-Package: org.eclipse.jgit.lfs;version="5.12.1", + org.eclipse.jgit.lfs.errors;version="5.12.1", + org.eclipse.jgit.lfs.internal;version="5.12.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.12.1" 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.12.0,5.13.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.attributes;version="[5.12.0,5.13.0)", - org.eclipse.jgit.diff;version="[5.12.0,5.13.0)", - org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.hooks;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.storage.pack;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport.http;version="[5.12.0,5.13.0)", - org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)" + org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.attributes;version="[5.12.1,5.13.0)", + org.eclipse.jgit.diff;version="[5.12.1,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.hooks;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.storage.pack;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport.http;version="[5.12.1,5.13.0)", + org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.treewalk.filter;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util.io;version="[5.12.1,5.13.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 1540c2b54d..9aca20a3d5 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.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 1295bf8aa6..505d0e9217 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs</artifactId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index e5ef30aa41..ed16046d5b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit" label="%featureName" - version="5.12.0.qualifier" + version="5.12.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 3fa237c316..6e0d1dffbb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index bd4c49fb4f..d14864679e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.gpg.bc" label="%featureName" - version="5.12.0.qualifier" + version="5.12.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import plugin="org.eclipse.jgit" version="5.12.0" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="5.12.1" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 626933465a..59863eec9f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 5de91d50e5..d392f130a8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.http.apache" label="%featureName" - version="5.12.0.qualifier" + version="5.12.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import plugin="org.eclipse.jgit" version="5.12.0" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="5.12.1" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index aa08757bd8..dc4f3eccd3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 15ba0ff86b..a3730b7fd2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.junit" label="%featureName" - version="5.12.0.qualifier" + version="5.12.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -24,7 +24,7 @@ <requires> <import plugin="com.jcraft.jsch"/> - <import plugin="org.eclipse.jgit" version="5.12.0" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="5.12.1" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 2434a94a57..5717376fd7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 2b1738d622..bfaa0faba1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.lfs" label="%featureName" - version="5.12.0.qualifier" + version="5.12.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import feature="org.eclipse.jgit" version="5.12.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="5.12.1" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 3c536f7199..3e34991784 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 0941cc69d0..46556f6fcf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.pgm" label="%featureName" - version="5.12.0.qualifier" + version="5.12.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -35,9 +35,9 @@ version="0.0.0"/> <requires> - <import feature="org.eclipse.jgit" version="5.12.0" match="equivalent"/> - <import feature="org.eclipse.jgit.lfs" version="5.12.0" match="equivalent"/> - <import feature="org.eclipse.jgit.ssh.apache" version="5.12.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="5.12.1" match="equivalent"/> + <import feature="org.eclipse.jgit.lfs" version="5.12.1" match="equivalent"/> + <import feature="org.eclipse.jgit.ssh.apache" version="5.12.1" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 924cebdc30..2ba41195e6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index c12f4d920b..68781c1230 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.repository</artifactId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 017d4f24c6..3607076b2f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.source" label="%featureName" - version="5.12.0.qualifier" + version="5.12.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import feature="org.eclipse.jgit" version="5.12.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="5.12.1" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index cd47a06b63..fb3fcad1dc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> @@ -30,7 +30,7 @@ <dependency> <groupId>org.eclipse.jgit.feature</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 2386f7b0c7..d748508838 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.ssh.apache" label="%featureName" - version="5.12.0.qualifier" + version="5.12.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import feature="org.eclipse.jgit" version="5.12.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="5.12.1" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index ea12537ca4..a9cd77007e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 15cbc1594e..8147102d34 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.ssh.jsch" label="%featureName" - version="5.12.0.qualifier" + version="5.12.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import plugin="org.eclipse.jgit" version="5.12.0" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="5.12.1" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index f1d17867c8..dcf998fa26 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index 0d297e3cde..92d1ade07d 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.12.0.qualifier +Bundle-Version: 5.12.1.qualifier diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target index 97339d9fb0..8cc851d651 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.10" sequenceNumber="1622748551"> +<target name="jgit-4.10" sequenceNumber="1623012846"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/> - <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/> + <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/> + <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.6.v20201231-1626"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target index 37df9d93e8..164cd82ca0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.11" sequenceNumber="1622748551"> +<target name="jgit-4.11" sequenceNumber="1623012873"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/> - <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/> + <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/> + <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.6.v20201231-1626"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target index 4b3f8eb41d..ed8ad0b6ba 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.12" sequenceNumber="1622748551"> +<target name="jgit-4.12" sequenceNumber="1623012873"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/> - <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/> + <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/> + <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.6.v20201231-1626"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target index 8594f26035..993e1123a5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.13.target @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.13" sequenceNumber="1622748551"> +<target name="jgit-4.13" sequenceNumber="1623012873"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/> - <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/> + <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/> + <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.6.v20201231-1626"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target index 12670cedc4..e8cfa6073c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.14.target @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.14" sequenceNumber="1622748551"> +<target name="jgit-4.14" sequenceNumber="1623012870"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/> - <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/> + <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/> + <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.6.v20201231-1626"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target index c5684a29a1..81c64502bf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.15.target @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.15" sequenceNumber="1622748551"> +<target name="jgit-4.15" sequenceNumber="1623012870"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/> - <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/> + <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/> + <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.6.v20201231-1626"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target index 2c0a4fbd39..3afc3b8e6d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.16.target @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.16" sequenceNumber="1622748551"> +<target name="jgit-4.16" sequenceNumber="1623012874"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/> - <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/> + <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/> + <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.6.v20201231-1626"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target index 6734af98b4..f61261fc62 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.17" sequenceNumber="1622748551"> +<target name="jgit-4.17" sequenceNumber="1623012875"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/> - <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/> + <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/> + <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.6.v20201231-1626"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target index 6916aa9f6e..c17c1c81ab 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.18" sequenceNumber="1622748551"> +<target name="jgit-4.18" sequenceNumber="1623012874"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/> - <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/> + <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/> + <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.6.v20201231-1626"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target index b78e3f0ae3..6db7fe19f0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.19-staging" sequenceNumber="1622748551"> +<target name="jgit-4.19-staging" sequenceNumber="1623012870"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/> - <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/> + <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/> + <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.6.v20201231-1626"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20-staging.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20-staging.target index 1d0763f190..f256622f4b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20-staging.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20-staging.target @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.20-staging" sequenceNumber="1622748551"> +<target name="jgit-4.20-staging" sequenceNumber="1623012876"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/> - <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/> + <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/> + <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.6.v20201231-1626"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target index 3c097f57a1..ca1696be32 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.6" sequenceNumber="1622748551"> +<target name="jgit-4.6" sequenceNumber="1623012886"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/> - <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/> + <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/> + <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.6.v20201231-1626"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target index 7ec9f75ef6..60983880e2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.7" sequenceNumber="1622748551"> +<target name="jgit-4.7" sequenceNumber="1623012878"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/> - <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/> + <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/> + <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.6.v20201231-1626"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target index 2f2dd767f9..180b814523 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.8" sequenceNumber="1622748551"> +<target name="jgit-4.8" sequenceNumber="1623012874"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/> - <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/> + <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/> + <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.6.v20201231-1626"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target index f8745aed2e..27b3096f21 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.9" sequenceNumber="1622748551"> +<target name="jgit-4.9" sequenceNumber="1623012874"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.jetty.client" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.client.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax" version="9.4.40.v20210413"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.40.v20210413"/> - <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/"/> + <unit id="org.eclipse.jetty.client" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.client.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.41.v20210516"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.41.v20210516"/> + <repository id="jetty-9.4.40" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.8.6.v20201231-1626"/> 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 993f552384..5847b79cbe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.target</artifactId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd index 0f0b1005ce..fb0df1e8fe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.x.tpd @@ -1,22 +1,22 @@ target "jetty-9.4.x" with source configurePhase -location jetty-9.4.40 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.40.v20210413/" { - org.eclipse.jetty.client [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.client.source [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.continuation [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.continuation.source [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.http [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.http.source [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.io [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.io.source [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.security [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.security.source [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.server [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.server.source [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.servlet [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.servlet.source [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.util [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.util.source [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.util.ajax [9.4.40.v20210413,9.4.40.v20210413] - org.eclipse.jetty.util.ajax.source [9.4.40.v20210413,9.4.40.v20210413] +location jetty-9.4.40 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.41.v20210516/" { + org.eclipse.jetty.client [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.client.source [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.continuation [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.continuation.source [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.http [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.http.source [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.io [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.io.source [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.security [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.security.source [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.server [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.server.source [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.servlet [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.servlet.source [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.util [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.util.source [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.util.ajax [9.4.41.v20210516,9.4.41.v20210516] + org.eclipse.jetty.util.ajax.source [9.4.41.v20210516,9.4.41.v20210516] } diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 9e851dd7df..7ff001e1e9 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> <packaging>pom</packaging> <name>JGit Tycho Parent</name> diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 9e18df9f00..704ad7cc6c 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.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[5.12.0,5.13.0)", - org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.diff;version="[5.12.0,5.13.0)", - org.eclipse.jgit.dircache;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.file;version="5.12.0", - org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.merge;version="[5.12.0,5.13.0)", - org.eclipse.jgit.pgm;version="[5.12.0,5.13.0)", - org.eclipse.jgit.pgm.internal;version="[5.12.0,5.13.0)", - org.eclipse.jgit.pgm.opt;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", - org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)", +Import-Package: org.eclipse.jgit.api;version="[5.12.1,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.diff;version="[5.12.1,5.13.0)", + org.eclipse.jgit.dircache;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="5.12.1", + org.eclipse.jgit.junit;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.merge;version="[5.12.1,5.13.0)", + org.eclipse.jgit.pgm;version="[5.12.1,5.13.0)", + org.eclipse.jgit.pgm.internal;version="[5.12.1,5.13.0)", + org.eclipse.jgit.pgm.opt;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util.io;version="[5.12.1,5.13.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 8398d6bfc0..77dd85fd81 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm.test</artifactId> diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index fe1b42bf8f..b4a18585c8 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.12.0.qualifier +Bundle-Version: 5.12.1.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.12.0,5.13.0)", - org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.archive;version="[5.12.0,5.13.0)", - org.eclipse.jgit.awtui;version="[5.12.0,5.13.0)", - org.eclipse.jgit.blame;version="[5.12.0,5.13.0)", - org.eclipse.jgit.diff;version="[5.12.0,5.13.0)", - org.eclipse.jgit.dircache;version="[5.12.0,5.13.0)", - org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.gitrepo;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.io;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs.server;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs.server.s3;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.merge;version="[5.12.0,5.13.0)", - org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", - org.eclipse.jgit.notes;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revplot;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk.filter;version="[5.12.0,5.13.0)", - org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.storage.pack;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport.http.apache;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport.sshd;version="[5.12.0,5.13.0)", - org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api;version="[5.12.1,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.archive;version="[5.12.1,5.13.0)", + org.eclipse.jgit.awtui;version="[5.12.1,5.13.0)", + org.eclipse.jgit.blame;version="[5.12.1,5.13.0)", + org.eclipse.jgit.diff;version="[5.12.1,5.13.0)", + org.eclipse.jgit.dircache;version="[5.12.1,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.gitrepo;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.io;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs.server;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs.server.s3;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.merge;version="[5.12.1,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.1,5.13.0)", + org.eclipse.jgit.notes;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revplot;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk.filter;version="[5.12.1,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.storage.pack;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport.http.apache;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport.resolver;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport.sshd;version="[5.12.1,5.13.0)", + org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.treewalk.filter;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util.io;version="[5.12.1,5.13.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.12.0"; +Export-Package: org.eclipse.jgit.console;version="5.12.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="5.12.0"; + org.eclipse.jgit.pgm;version="5.12.1"; 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.12.0"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="5.12.0"; + org.eclipse.jgit.pgm.debug;version="5.12.1"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="5.12.0"; + org.eclipse.jgit.pgm.internal;version="5.12.1"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="5.12.0"; + org.eclipse.jgit.pgm.opt;version="5.12.1"; 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 017861c8c6..8f433d5633 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.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 4e1485885b..36da4aaa93 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm</artifactId> diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 2a116523e7..2a905a1bac 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.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -20,15 +20,15 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.6.0,2.7.0)", org.apache.sshd.core;version="[2.6.0,2.7.0)", org.apache.sshd.server;version="[2.6.0,2.7.0)", org.apache.sshd.server.forward;version="[2.6.0,2.7.0)", - org.eclipse.jgit.api;version="[5.12.0,5.13.0)", - org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.12.0,5.13.0)", - org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", - org.eclipse.jgit.junit.ssh;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport.sshd;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api;version="[5.12.1,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.12.1,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.1,5.13.0)", + org.eclipse.jgit.junit.ssh;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport.sshd;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index adc9bee780..5af16c7b29 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.apache.test</artifactId> diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 39af83d57b..0645964178 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.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.12.0";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.12.1";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.12.0";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.12.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="5.12.0";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.transport.sshd;version="5.12.0"; + org.eclipse.jgit.internal.transport.sshd.auth;version="5.12.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="5.12.1";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.transport.sshd;version="5.12.1"; 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.6.0,2.7.0)", org.apache.sshd.sftp.client;version="[2.6.0,2.7.0)", org.apache.sshd.sftp.common;version="[2.6.0,2.7.0)", - org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)", - org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.fnmatch;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.transport.ssh;version="[5.12.0,5.13.0)", - org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", + org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.fnmatch;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.transport.ssh;version="[5.12.1,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.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 cd7f30c31a..80a27d4123 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.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index c53dcace2b..f754a3a4f2 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.apache</artifactId> diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index c2d3423cae..be16ab05a2 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.12.0.qualifier +Bundle-Version: 5.12.1.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.12.0,5.13.0)", - org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", - org.eclipse.jgit.junit.ssh;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.1,5.13.0)", + org.eclipse.jgit.junit.ssh;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 781d903156..8c6533c2fa 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.jsch.test</artifactId> diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index a23e3d801b..0ae28678e5 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.12.0,5.13.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[5.12.1,5.13.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 5.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.12.0";x-friends:="org.eclipse.egit.core", - org.eclipse.jgit.transport;version="5.12.0"; +Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.12.1";x-friends:="org.eclipse.egit.core", + org.eclipse.jgit.transport;version="5.12.1"; 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.12.0,5.13.0)", - org.eclipse.jgit.internal;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.transport.ssh;version="[5.12.0,5.13.0)", - org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.transport.ssh;version="[5.12.1,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util.io;version="[5.12.1,5.13.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 37f209658b..8a4342b9d2 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.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index ea34818f0d..2bbbe64f22 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.jsch</artifactId> diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 4800cfcf66..2fba2d3c7d 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.12.0.qualifier +Bundle-Version: 5.12.1.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.12.0,5.13.0)", - org.eclipse.jgit.api;version="[5.12.0,5.13.0)", - org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.archive;version="[5.12.0,5.13.0)", - org.eclipse.jgit.attributes;version="[5.12.0,5.13.0)", - org.eclipse.jgit.awtui;version="[5.12.0,5.13.0)", - org.eclipse.jgit.blame;version="[5.12.0,5.13.0)", - org.eclipse.jgit.diff;version="[5.12.0,5.13.0)", - org.eclipse.jgit.dircache;version="[5.12.0,5.13.0)", - org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.events;version="[5.12.0,5.13.0)", - org.eclipse.jgit.fnmatch;version="[5.12.0,5.13.0)", - org.eclipse.jgit.gitrepo;version="[5.12.0,5.13.0)", - org.eclipse.jgit.hooks;version="[5.12.0,5.13.0)", - org.eclipse.jgit.ignore;version="[5.12.0,5.13.0)", - org.eclipse.jgit.ignore.internal;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.fsck;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.revwalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.io;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.transport.http;version="[5.12.0,5.13.0)", - org.eclipse.jgit.internal.transport.parser;version="[5.12.0,5.13.0)", - org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", - org.eclipse.jgit.junit.time;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lfs;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib.internal;version="[5.12.0,5.13.0)", - org.eclipse.jgit.logging;version="[5.12.0,5.13.0)", - org.eclipse.jgit.merge;version="[5.12.0,5.13.0)", - org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", - org.eclipse.jgit.notes;version="[5.12.0,5.13.0)", - org.eclipse.jgit.patch;version="[5.12.0,5.13.0)", - org.eclipse.jgit.pgm;version="[5.12.0,5.13.0)", - org.eclipse.jgit.pgm.internal;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revplot;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk.filter;version="[5.12.0,5.13.0)", - org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)", - org.eclipse.jgit.storage.pack;version="[5.12.0,5.13.0)", - org.eclipse.jgit.submodule;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport.http;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)", - org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util.sha1;version="[5.12.0,5.13.0)", + org.eclipse.jgit.annotations;version="[5.12.1,5.13.0)", + org.eclipse.jgit.api;version="[5.12.1,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.archive;version="[5.12.1,5.13.0)", + org.eclipse.jgit.attributes;version="[5.12.1,5.13.0)", + org.eclipse.jgit.awtui;version="[5.12.1,5.13.0)", + org.eclipse.jgit.blame;version="[5.12.1,5.13.0)", + org.eclipse.jgit.diff;version="[5.12.1,5.13.0)", + org.eclipse.jgit.dircache;version="[5.12.1,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.events;version="[5.12.1,5.13.0)", + org.eclipse.jgit.fnmatch;version="[5.12.1,5.13.0)", + org.eclipse.jgit.gitrepo;version="[5.12.1,5.13.0)", + org.eclipse.jgit.hooks;version="[5.12.1,5.13.0)", + org.eclipse.jgit.ignore;version="[5.12.1,5.13.0)", + org.eclipse.jgit.ignore.internal;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.fsck;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.io;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.transport.http;version="[5.12.1,5.13.0)", + org.eclipse.jgit.internal.transport.parser;version="[5.12.1,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.1,5.13.0)", + org.eclipse.jgit.junit.time;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lfs;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib.internal;version="[5.12.1,5.13.0)", + org.eclipse.jgit.logging;version="[5.12.1,5.13.0)", + org.eclipse.jgit.merge;version="[5.12.1,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.1,5.13.0)", + org.eclipse.jgit.notes;version="[5.12.1,5.13.0)", + org.eclipse.jgit.patch;version="[5.12.1,5.13.0)", + org.eclipse.jgit.pgm;version="[5.12.1,5.13.0)", + org.eclipse.jgit.pgm.internal;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revplot;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk.filter;version="[5.12.1,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.1,5.13.0)", + org.eclipse.jgit.storage.pack;version="[5.12.1,5.13.0)", + org.eclipse.jgit.submodule;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport.http;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport.resolver;version="[5.12.1,5.13.0)", + org.eclipse.jgit.treewalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.treewalk.filter;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util.io;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util.sha1;version="[5.12.1,5.13.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.function;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 5339873146..3224e991e7 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.test</artifactId> diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java index 25cd227f02..6357a0b9a8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java @@ -190,15 +190,28 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { if (atomic) { assertResults(cmds, TRANSACTION_ABORTED, REJECTED_NONFASTFORWARD); assertRefs("refs/heads/master", A, "refs/heads/masters", B); - assertEquals(1, refsChangedEvents); } else { assertResults(cmds, OK, REJECTED_NONFASTFORWARD); assertRefs("refs/heads/master", B, "refs/heads/masters", B); - assertEquals(2, refsChangedEvents); } } @Test + public void simpleNoForceRefsChangedEvents() throws IOException { + writeLooseRefs("refs/heads/master", A, "refs/heads/masters", B); + int initialRefsChangedEvents = refsChangedEvents; + + List<ReceiveCommand> cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(B, A, "refs/heads/masters", + UPDATE_NONFASTFORWARD)); + execute(newBatchUpdate(cmds)); + + assertEquals(atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 1, refsChangedEvents); + } + + @Test public void simpleForce() throws IOException { writeLooseRefs("refs/heads/master", A, "refs/heads/masters", B); @@ -210,7 +223,21 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertResults(cmds, OK, OK); assertRefs("refs/heads/master", B, "refs/heads/masters", A); - assertEquals(batchesRefUpdates() ? 2 : 3, refsChangedEvents); + } + + @Test + public void simpleForceRefsChangedEvents() throws IOException { + writeLooseRefs("refs/heads/master", A, "refs/heads/masters", B); + int initialRefsChangedEvents = refsChangedEvents; + + List<ReceiveCommand> cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(B, A, "refs/heads/masters", + UPDATE_NONFASTFORWARD)); + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + + assertEquals(batchesRefUpdates() ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); } @Test @@ -232,7 +259,27 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertResults(cmds, OK); assertRefs("refs/heads/master", A); - assertEquals(2, refsChangedEvents); + } + + @Test + public void nonFastForwardDoesNotDoExpensiveMergeCheckRefsChangedEvents() + throws IOException { + writeLooseRef("refs/heads/master", B); + int initialRefsChangedEvents = refsChangedEvents; + + List<ReceiveCommand> cmds = Arrays.asList(new ReceiveCommand(B, A, + "refs/heads/master", UPDATE_NONFASTFORWARD)); + try (RevWalk rw = new RevWalk(diskRepo) { + @Override + public boolean isMergedInto(RevCommit base, RevCommit tip) { + throw new AssertionError("isMergedInto() should not be called"); + } + }) { + newBatchUpdate(cmds).setAllowNonFastForwards(true).execute(rw, + new StrictWorkMonitor()); + } + + assertEquals(initialRefsChangedEvents + 1, refsChangedEvents); } @Test @@ -251,17 +298,30 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertResults(cmds, LOCK_FAILURE, TRANSACTION_ABORTED, TRANSACTION_ABORTED); assertRefs("refs/heads/master", A, "refs/heads/masters", B); - assertEquals(1, refsChangedEvents); } else { // Non-atomic updates are applied in order: master succeeds, then // master/x fails due to conflict. assertResults(cmds, OK, LOCK_FAILURE, LOCK_FAILURE); assertRefs("refs/heads/master", B, "refs/heads/masters", B); - assertEquals(2, refsChangedEvents); } } @Test + public void fileDirectoryConflictRefsChangedEvents() throws IOException { + writeLooseRefs("refs/heads/master", A, "refs/heads/masters", B); + int initialRefsChangedEvents = refsChangedEvents; + + List<ReceiveCommand> cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(zeroId(), A, "refs/heads/master/x", CREATE), + new ReceiveCommand(zeroId(), A, "refs/heads", CREATE)); + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true), false); + + assertEquals(atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 1, refsChangedEvents); + } + + @Test public void conflictThanksToDelete() throws IOException { writeLooseRefs("refs/heads/master", A, "refs/heads/masters", B); @@ -273,15 +333,21 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertResults(cmds, OK, OK, OK); assertRefs("refs/heads/master", B, "refs/heads/masters/x", A); - if (atomic) { - assertEquals(2, refsChangedEvents); - } else if (!useReftable) { - // The non-atomic case actually produces 5 events, but that's an - // implementation detail. We expect at least 4 events, one for the - // initial read due to writeLooseRef(), and then one for each - // successful ref update. - assertTrue(refsChangedEvents >= 4); - } + } + + @Test + public void conflictThanksToDeleteRefsChangedEvents() throws IOException { + writeLooseRefs("refs/heads/master", A, "refs/heads/masters", B); + int initialRefsChangedEvents = refsChangedEvents; + + List<ReceiveCommand> cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(zeroId(), A, "refs/heads/masters/x", CREATE), + new ReceiveCommand(B, zeroId(), "refs/heads/masters", DELETE)); + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + + assertEquals(batchesRefUpdates() ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 3, refsChangedEvents); } @Test @@ -298,15 +364,29 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { if (atomic) { assertResults(cmds, REJECTED_MISSING_OBJECT, TRANSACTION_ABORTED); assertRefs("refs/heads/master", A); - assertEquals(1, refsChangedEvents); } else { assertResults(cmds, REJECTED_MISSING_OBJECT, OK); assertRefs("refs/heads/master", A, "refs/heads/foo2", B); - assertEquals(2, refsChangedEvents); } } @Test + public void updateToMissingObjectRefsChangedEvents() throws IOException { + writeLooseRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; + + ObjectId bad = ObjectId + .fromString("deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"); + List<ReceiveCommand> cmds = Arrays.asList( + new ReceiveCommand(A, bad, "refs/heads/master", UPDATE), + new ReceiveCommand(zeroId(), B, "refs/heads/foo2", CREATE)); + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true), false); + + assertEquals(atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 1, refsChangedEvents); + } + + @Test public void addMissingObject() throws IOException { writeLooseRef("refs/heads/master", A); @@ -320,15 +400,29 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { if (atomic) { assertResults(cmds, TRANSACTION_ABORTED, REJECTED_MISSING_OBJECT); assertRefs("refs/heads/master", A); - assertEquals(1, refsChangedEvents); } else { assertResults(cmds, OK, REJECTED_MISSING_OBJECT); assertRefs("refs/heads/master", B); - assertEquals(2, refsChangedEvents); } } @Test + public void addMissingObjectRefsChangedEvents() throws IOException { + writeLooseRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; + + ObjectId bad = ObjectId + .fromString("deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"); + List<ReceiveCommand> cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(zeroId(), bad, "refs/heads/foo2", CREATE)); + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true), false); + + assertEquals(atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 1, refsChangedEvents); + } + + @Test public void oneNonExistentRef() throws IOException { List<ReceiveCommand> cmds = Arrays.asList( new ReceiveCommand(A, B, "refs/heads/foo1", UPDATE), @@ -358,15 +452,27 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { if (atomic) { assertResults(cmds, LOCK_FAILURE, TRANSACTION_ABORTED); assertRefs("refs/heads/master", A); - assertEquals(1, refsChangedEvents); } else { assertResults(cmds, LOCK_FAILURE, OK); assertRefs("refs/heads/master", A, "refs/heads/foo2", B); - assertEquals(2, refsChangedEvents); } } @Test + public void oneRefWrongOldValueRefsChangedEvents() throws IOException { + writeLooseRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; + + List<ReceiveCommand> cmds = Arrays.asList( + new ReceiveCommand(B, B, "refs/heads/master", UPDATE), + new ReceiveCommand(zeroId(), B, "refs/heads/foo2", CREATE)); + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + + assertEquals(atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 1, refsChangedEvents); + } + + @Test public void nonExistentRef() throws IOException { writeLooseRef("refs/heads/master", A); @@ -378,17 +484,31 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { if (atomic) { assertResults(cmds, TRANSACTION_ABORTED, LOCK_FAILURE); assertRefs("refs/heads/master", A); - assertEquals(1, refsChangedEvents); } else { assertResults(cmds, OK, LOCK_FAILURE); assertRefs("refs/heads/master", B); - assertEquals(2, refsChangedEvents); } } @Test + public void nonExistentRefRefsChangedEvents() throws IOException { + writeLooseRef("refs/heads/master", A); + + int initialRefsChangedEvents = refsChangedEvents; + + List<ReceiveCommand> cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(A, zeroId(), "refs/heads/foo2", DELETE)); + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + + assertEquals(atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 1, refsChangedEvents); + } + + @Test public void noRefLog() throws IOException { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; Map<String, ReflogEntry> oldLogs = getLastReflogs("refs/heads/master", "refs/heads/branch"); @@ -402,7 +522,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertResults(cmds, OK, OK); assertRefs("refs/heads/master", B, "refs/heads/branch", B); - assertEquals(batchesRefUpdates() ? 2 : 3, refsChangedEvents); + assertEquals(batchesRefUpdates() ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); assertReflogUnchanged(oldLogs, "refs/heads/master"); assertReflogUnchanged(oldLogs, "refs/heads/branch"); } @@ -411,6 +532,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { public void reflogDefaultIdent() throws IOException { writeRef("refs/heads/master", A); writeRef("refs/heads/branch2", A); + int initialRefsChangedEvents = refsChangedEvents; Map<String, ReflogEntry> oldLogs = getLastReflogs("refs/heads/master", "refs/heads/branch1", "refs/heads/branch2"); @@ -423,7 +545,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertResults(cmds, OK, OK); assertRefs("refs/heads/master", B, "refs/heads/branch1", B, "refs/heads/branch2", A); - assertEquals(batchesRefUpdates() ? 3 : 4, refsChangedEvents); + assertEquals(batchesRefUpdates() ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); assertReflogEquals(reflog(A, B, new PersonIdent(diskRepo), "a reflog"), getLastReflog("refs/heads/master")); assertReflogEquals( @@ -436,6 +559,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { public void reflogAppendStatusNoMessage() throws IOException { writeRef("refs/heads/master", A); writeRef("refs/heads/branch1", B); + int initialRefsChangedEvents = refsChangedEvents; List<ReceiveCommand> cmds = Arrays.asList( new ReceiveCommand(A, B, "refs/heads/master", UPDATE), @@ -448,7 +572,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertResults(cmds, OK, OK, OK); assertRefs("refs/heads/master", B, "refs/heads/branch1", A, "refs/heads/branch2", A); - assertEquals(batchesRefUpdates() ? 3 : 5, refsChangedEvents); + assertEquals(batchesRefUpdates() ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 3, refsChangedEvents); assertReflogEquals( // Always forced; setAllowNonFastForwards(true) bypasses the // check. @@ -465,6 +590,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void reflogAppendStatusFastForward() throws IOException { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; List<ReceiveCommand> cmds = Arrays .asList(new ReceiveCommand(A, B, "refs/heads/master", UPDATE)); @@ -472,7 +598,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertResults(cmds, OK); assertRefs("refs/heads/master", B); - assertEquals(2, refsChangedEvents); + assertEquals(initialRefsChangedEvents + 1, refsChangedEvents); assertReflogEquals( reflog(A, B, new PersonIdent(diskRepo), "fast-forward"), getLastReflog("refs/heads/master")); @@ -481,6 +607,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void reflogAppendStatusWithMessage() throws IOException { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; List<ReceiveCommand> cmds = Arrays.asList( new ReceiveCommand(A, B, "refs/heads/master", UPDATE), @@ -489,7 +616,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertResults(cmds, OK, OK); assertRefs("refs/heads/master", B, "refs/heads/branch", A); - assertEquals(batchesRefUpdates() ? 2 : 3, refsChangedEvents); + assertEquals(batchesRefUpdates() ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); assertReflogEquals( reflog(A, B, new PersonIdent(diskRepo), "a reflog: fast-forward"), @@ -503,6 +631,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void reflogCustomIdent() throws IOException { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; List<ReceiveCommand> cmds = Arrays.asList( new ReceiveCommand(A, B, "refs/heads/master", UPDATE), @@ -513,7 +642,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { .setRefLogIdent(ident)); assertResults(cmds, OK, OK); - assertEquals(batchesRefUpdates() ? 2 : 3, refsChangedEvents); + assertEquals(batchesRefUpdates() ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); assertRefs("refs/heads/master", B, "refs/heads/branch", B); assertReflogEquals(reflog(A, B, ident, "a reflog"), getLastReflog("refs/heads/master"), true); @@ -525,6 +655,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { public void reflogDelete() throws IOException { writeRef("refs/heads/master", A); writeRef("refs/heads/branch", A); + int initialRefsChangedEvents = refsChangedEvents; assertEquals(2, getLastReflogs("refs/heads/master", "refs/heads/branch") .size()); @@ -535,7 +666,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertResults(cmds, OK, OK); assertRefs("refs/heads/branch", B); - assertEquals(batchesRefUpdates() ? 3 : 4, refsChangedEvents); + assertEquals(batchesRefUpdates() ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); if (useReftable) { // reftable retains reflog entries for deleted branches. assertReflogEquals( @@ -551,6 +683,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void reflogFileDirectoryConflict() throws IOException { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; List<ReceiveCommand> cmds = Arrays.asList( new ReceiveCommand(A, zeroId(), "refs/heads/master", DELETE), @@ -559,7 +692,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertResults(cmds, OK, OK); assertRefs("refs/heads/master/x", A); - assertEquals(batchesRefUpdates() ? 2 : 3, refsChangedEvents); + assertEquals(batchesRefUpdates() ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); if (!useReftable) { // reftable retains reflog entries for deleted branches. assertNull(getLastReflog("refs/heads/master")); @@ -572,6 +706,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void reflogOnLockFailure() throws IOException { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; Map<String, ReflogEntry> oldLogs = getLastReflogs("refs/heads/master", "refs/heads/branch"); @@ -583,12 +718,12 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { if (atomic) { assertResults(cmds, TRANSACTION_ABORTED, LOCK_FAILURE); - assertEquals(1, refsChangedEvents); + assertEquals(initialRefsChangedEvents, refsChangedEvents); assertReflogUnchanged(oldLogs, "refs/heads/master"); assertReflogUnchanged(oldLogs, "refs/heads/branch"); } else { assertResults(cmds, OK, LOCK_FAILURE); - assertEquals(2, refsChangedEvents); + assertEquals(initialRefsChangedEvents + 1, refsChangedEvents); assertReflogEquals( reflog(A, B, new PersonIdent(diskRepo), "a reflog"), getLastReflog("refs/heads/master")); @@ -599,6 +734,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void overrideRefLogMessage() throws Exception { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; List<ReceiveCommand> cmds = Arrays.asList( new ReceiveCommand(A, B, "refs/heads/master", UPDATE), @@ -609,7 +745,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { .setRefLogMessage("a reflog", true)); assertResults(cmds, OK, OK); - assertEquals(batchesRefUpdates() ? 2 : 3, refsChangedEvents); + assertEquals(batchesRefUpdates() ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); assertReflogEquals(reflog(A, B, ident, "custom log"), getLastReflog("refs/heads/master"), true); assertReflogEquals(reflog(zeroId(), B, ident, "a reflog: created"), @@ -619,6 +756,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void overrideDisableRefLog() throws Exception { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; Map<String, ReflogEntry> oldLogs = getLastReflogs("refs/heads/master", "refs/heads/branch"); @@ -630,7 +768,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { execute(newBatchUpdate(cmds).setRefLogMessage("a reflog", true)); assertResults(cmds, OK, OK); - assertEquals(batchesRefUpdates() ? 2 : 3, refsChangedEvents); + assertEquals(batchesRefUpdates() ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); assertReflogUnchanged(oldLogs, "refs/heads/master"); assertReflogEquals( reflog(zeroId(), B, new PersonIdent(diskRepo), @@ -641,6 +780,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void refLogNotWrittenWithoutConfigOption() throws Exception { assumeFalse(useReftable); + setLogAllRefUpdates(false); writeRef("refs/heads/master", A); @@ -661,6 +801,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void forceRefLogInUpdate() throws Exception { assumeFalse(useReftable); + setLogAllRefUpdates(false); writeRef("refs/heads/master", A); assertTrue(getLastReflogs("refs/heads/master", "refs/heads/branch") @@ -683,6 +824,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void forceRefLogInCommand() throws Exception { assumeFalse(useReftable); + setLogAllRefUpdates(false); writeRef("refs/heads/master", A); @@ -723,13 +865,11 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { if (atomic) { assertResults(cmds, LOCK_FAILURE, TRANSACTION_ABORTED); assertRefs("refs/heads/master", A); - assertEquals(1, refsChangedEvents); } else { // Only operates on loose refs, doesn't care that packed-refs is // locked. assertResults(cmds, OK, OK); assertRefs("refs/heads/master", B, "refs/heads/branch", B); - assertEquals(3, refsChangedEvents); } } finally { myLock.unlock(); @@ -737,6 +877,28 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { } @Test + public void packedRefsLockFailureRefsChangedEvents() throws Exception { + assumeFalse(useReftable); + + writeLooseRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; + + List<ReceiveCommand> cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(zeroId(), B, "refs/heads/branch", CREATE)); + + LockFile myLock = refdir.lockPackedRefs(); + try { + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + + assertEquals(atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 2, refsChangedEvents); + } finally { + myLock.unlock(); + } + } + + @Test public void oneRefLockFailure() throws Exception { assumeFalse(useReftable); @@ -757,11 +919,9 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { if (atomic) { assertResults(cmds, TRANSACTION_ABORTED, LOCK_FAILURE); assertRefs("refs/heads/master", A); - assertEquals(1, refsChangedEvents); } else { assertResults(cmds, OK, LOCK_FAILURE); assertRefs("refs/heads/branch", B, "refs/heads/master", A); - assertEquals(2, refsChangedEvents); } } finally { myLock.unlock(); @@ -769,8 +929,32 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { } @Test + public void oneRefLockFailureRefsChangedEvents() throws Exception { + assumeFalse(useReftable); + + writeLooseRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; + + List<ReceiveCommand> cmds = Arrays.asList( + new ReceiveCommand(zeroId(), B, "refs/heads/branch", CREATE), + new ReceiveCommand(A, B, "refs/heads/master", UPDATE)); + + LockFile myLock = new LockFile(refdir.fileFor("refs/heads/master")); + assertTrue(myLock.lock()); + try { + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + + assertEquals(atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 1, refsChangedEvents); + } finally { + myLock.unlock(); + } + } + + @Test public void singleRefUpdateDoesNotRequirePackedRefsLock() throws Exception { assumeFalse(useReftable); + writeLooseRef("refs/heads/master", A); List<ReceiveCommand> cmds = Arrays @@ -782,7 +966,6 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertFalse(getLockFile("refs/heads/master").exists()); assertResults(cmds, OK); - assertEquals(2, refsChangedEvents); assertRefs("refs/heads/master", B); } finally { myLock.unlock(); @@ -790,6 +973,27 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { } @Test + public void singleRefUpdateDoesNotRequirePackedRefsLockRefsChangedEvents() + throws Exception { + assumeFalse(useReftable); + + writeLooseRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; + + List<ReceiveCommand> cmds = Arrays + .asList(new ReceiveCommand(A, B, "refs/heads/master", UPDATE)); + + LockFile myLock = refdir.lockPackedRefs(); + try { + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + + assertEquals(initialRefsChangedEvents + 1, refsChangedEvents); + } finally { + myLock.unlock(); + } + } + + @Test public void atomicUpdateRespectsInProcessLock() throws Exception { assumeTrue(atomic); assumeFalse(useReftable); @@ -838,10 +1042,56 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { } assertResults(cmds, OK, OK); - assertEquals(2, refsChangedEvents); assertRefs("refs/heads/master", B, "refs/heads/branch", B); } + @Test + public void atomicUpdateRespectsInProcessLockRefsChangedEvents() + throws Exception { + assumeTrue(atomic); + assumeFalse(useReftable); + + writeLooseRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; + + List<ReceiveCommand> cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(zeroId(), B, "refs/heads/branch", CREATE)); + + Thread t = new Thread(() -> { + try { + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + + ReentrantLock l = refdir.inProcessPackedRefsLock; + l.lock(); + try { + t.start(); + long timeoutSecs = 10; + + // Hold onto the lock until we observe the worker thread has + // attempted to + // acquire it. + while (l.getQueueLength() == 0) { + Thread.sleep(3); + } + + // Once we unlock, the worker thread should finish the update + // promptly. + l.unlock(); + t.join(SECONDS.toMillis(timeoutSecs)); + } finally { + if (l.isHeldByCurrentThread()) { + l.unlock(); + } + } + + assertEquals(initialRefsChangedEvents + 1, refsChangedEvents); + } + private void setLogAllRefUpdates(boolean enable) throws Exception { StoredConfig cfg = diskRepo.getConfig(); cfg.load(); @@ -855,6 +1105,11 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { writeRef(name, id); } else { write(new File(diskRepo.getDirectory(), name), id.name() + "\n"); + // force the refs-changed event to be fired for the loose ref that + // was created. We do this to get the events fired during the test + // 'setup' out of the way and this allows us to now accurately + // assert only for the new events fired during the BatchRefUpdate. + refdir.exactRef(name); } } @@ -957,11 +1212,11 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { } enum Result { - OK(ReceiveCommand.Result.OK), LOCK_FAILURE( - ReceiveCommand.Result.LOCK_FAILURE), REJECTED_NONFASTFORWARD( - ReceiveCommand.Result.REJECTED_NONFASTFORWARD), REJECTED_MISSING_OBJECT( - ReceiveCommand.Result.REJECTED_MISSING_OBJECT), TRANSACTION_ABORTED( - ReceiveCommand::isTransactionAborted); + OK(ReceiveCommand.Result.OK), + LOCK_FAILURE(ReceiveCommand.Result.LOCK_FAILURE), + REJECTED_NONFASTFORWARD(ReceiveCommand.Result.REJECTED_NONFASTFORWARD), + REJECTED_MISSING_OBJECT(ReceiveCommand.Result.REJECTED_MISSING_OBJECT), + TRANSACTION_ABORTED(ReceiveCommand::isTransactionAborted); @SuppressWarnings("ImmutableEnumChecker") final Predicate<? super ReceiveCommand> p; diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 824a446ee7..85889958c8 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.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.awtui;version="5.12.0" -Import-Package: org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", - org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", - org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revplot;version="[5.12.0,5.13.0)", - org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", - org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", - org.eclipse.jgit.util;version="[5.12.0,5.13.0)" +Export-Package: org.eclipse.jgit.awtui;version="5.12.1" +Import-Package: org.eclipse.jgit.errors;version="[5.12.1,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.1,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revplot;version="[5.12.1,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.1,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.1,5.13.0)", + org.eclipse.jgit.util;version="[5.12.1,5.13.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 0a53526c47..009ecdc043 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.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index ca8a66372f..7ff29f929b 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ui</artifactId> diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 7d076965e0..9a5793ab25 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.12.0.qualifier +Bundle-Version: 5.12.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="5.12.0", - org.eclipse.jgit.api;version="5.12.0"; +Export-Package: org.eclipse.jgit.annotations;version="5.12.1", + org.eclipse.jgit.api;version="5.12.1"; 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.12.0", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="5.12.0"; + org.eclipse.jgit.api.errors;version="5.12.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="5.12.0"; + org.eclipse.jgit.attributes;version="5.12.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="5.12.0"; + org.eclipse.jgit.blame;version="5.12.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="5.12.0"; + org.eclipse.jgit.diff;version="5.12.1"; 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.12.0", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="5.12.0"; + org.eclipse.jgit.dircache;version="5.12.1"; 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.12.0"; + org.eclipse.jgit.errors;version="5.12.1"; 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.12.0"; + org.eclipse.jgit.events;version="5.12.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="5.12.0", - org.eclipse.jgit.gitrepo;version="5.12.0"; + org.eclipse.jgit.fnmatch;version="5.12.1", + org.eclipse.jgit.gitrepo;version="5.12.1"; 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.12.0";x-internal:=true, - org.eclipse.jgit.hooks;version="5.12.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="5.12.0", - org.eclipse.jgit.ignore.internal;version="5.12.0"; + org.eclipse.jgit.gitrepo.internal;version="5.12.1";x-internal:=true, + org.eclipse.jgit.hooks;version="5.12.1";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="5.12.1", + org.eclipse.jgit.ignore.internal;version="5.12.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="5.12.0"; + org.eclipse.jgit.internal;version="5.12.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.fsck;version="5.12.0"; + org.eclipse.jgit.internal.fsck;version="5.12.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="5.12.0"; + org.eclipse.jgit.internal.revwalk;version="5.12.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="5.12.0"; + org.eclipse.jgit.internal.storage.dfs;version="5.12.1"; 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.12.0"; + org.eclipse.jgit.internal.storage.file;version="5.12.1"; 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.12.0", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="5.12.0"; + org.eclipse.jgit.internal.storage.io;version="5.12.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="5.12.0"; + org.eclipse.jgit.internal.storage.pack;version="5.12.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="5.12.0"; + org.eclipse.jgit.internal.storage.reftable;version="5.12.1"; 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.12.0";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="5.12.0"; + org.eclipse.jgit.internal.submodule;version="5.12.1";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="5.12.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="5.12.0"; + org.eclipse.jgit.internal.transport.http;version="5.12.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="5.12.0"; + org.eclipse.jgit.internal.transport.parser;version="5.12.1"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="5.12.0"; + org.eclipse.jgit.internal.transport.ssh;version="5.12.1"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch", - org.eclipse.jgit.lib;version="5.12.0"; + org.eclipse.jgit.lib;version="5.12.1"; 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.12.0", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="5.12.0"; + org.eclipse.jgit.lib.internal;version="5.12.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.logging;version="5.12.0", - org.eclipse.jgit.merge;version="5.12.0"; + org.eclipse.jgit.logging;version="5.12.1", + org.eclipse.jgit.merge;version="5.12.1"; 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.12.0", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="5.12.0", - org.eclipse.jgit.notes;version="5.12.0"; + org.eclipse.jgit.nls;version="5.12.1", + org.eclipse.jgit.notes;version="5.12.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="5.12.0"; + org.eclipse.jgit.patch;version="5.12.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="5.12.0"; + org.eclipse.jgit.revplot;version="5.12.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="5.12.0"; + org.eclipse.jgit.revwalk;version="5.12.1"; 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.12.0"; + org.eclipse.jgit.revwalk.filter;version="5.12.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="5.12.0"; + org.eclipse.jgit.storage.file;version="5.12.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="5.12.0"; + org.eclipse.jgit.storage.pack;version="5.12.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="5.12.0"; + org.eclipse.jgit.submodule;version="5.12.1"; 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.12.0"; + org.eclipse.jgit.transport;version="5.12.1"; uses:="javax.crypto, org.eclipse.jgit.util.io, org.eclipse.jgit.lib, @@ -184,21 +184,21 @@ Export-Package: org.eclipse.jgit.annotations;version="5.12.0", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="5.12.0"; + org.eclipse.jgit.transport.http;version="5.12.1"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="5.12.0"; + org.eclipse.jgit.transport.resolver;version="5.12.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="5.12.0"; + org.eclipse.jgit.treewalk;version="5.12.1"; 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.12.0"; + org.eclipse.jgit.treewalk.filter;version="5.12.1"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="5.12.0"; + org.eclipse.jgit.util;version="5.12.1"; 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.12.0", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="5.12.0"; + org.eclipse.jgit.util.io;version="5.12.1"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="5.12.0", - org.eclipse.jgit.util.time;version="5.12.0" + org.eclipse.jgit.util.sha1;version="5.12.1", + org.eclipse.jgit.util.time;version="5.12.1" 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 0591651945..03ddbb74f9 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.12.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="5.12.0.qualifier";roots="." +Bundle-Version: 5.12.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="5.12.1.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index f947327775..c9fc127aef 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit</artifactId> diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 7d108feae9..17a910008c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -244,47 +244,18 @@ public class RefDirectory extends RefDatabase { /** {@inheritDoc} */ @Override public boolean isNameConflicting(String name) throws IOException { - RefList<Ref> packed = getPackedRefs(); - RefList<LooseRef> loose = getLooseRefs(); - // Cannot be nested within an existing reference. int lastSlash = name.lastIndexOf('/'); while (0 < lastSlash) { String needle = name.substring(0, lastSlash); - if (loose.contains(needle) || packed.contains(needle)) + if (exactRef(needle) != null) { return true; + } lastSlash = name.lastIndexOf('/', lastSlash - 1); } // Cannot be the container of an existing reference. - String prefix = name + '/'; - int idx; - - idx = -(packed.find(prefix) + 1); - if (idx < packed.size() && packed.get(idx).getName().startsWith(prefix)) - return true; - - idx = -(loose.find(prefix) + 1); - if (idx < loose.size() && loose.get(idx).getName().startsWith(prefix)) - return true; - - return false; - } - - private RefList<LooseRef> getLooseRefs() { - final RefList<LooseRef> oldLoose = looseRefs.get(); - - LooseScanner scan = new LooseScanner(oldLoose); - scan.scan(ALL); - - RefList<LooseRef> loose; - if (scan.newLoose != null) { - loose = scan.newLoose.toRefList(); - if (looseRefs.compareAndSet(oldLoose, loose)) - modCnt.incrementAndGet(); - } else - loose = oldLoose; - return loose; + return !getRefsByPrefix(name + '/').isEmpty(); } @Nullable diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java index 06009f885d..ef1379a238 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java @@ -13,7 +13,6 @@ package org.eclipse.jgit.lib; import static org.eclipse.jgit.transport.ReceiveCommand.Result.NOT_ATTEMPTED; import static org.eclipse.jgit.transport.ReceiveCommand.Result.REJECTED_OTHER_REASON; -import static java.util.stream.Collectors.toCollection; import java.io.IOException; import java.text.MessageFormat; @@ -29,7 +28,6 @@ import java.util.concurrent.TimeoutException; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.internal.JGitText; -import org.eclipse.jgit.lib.RefUpdate.Result; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.transport.PushCertificate; import org.eclipse.jgit.transport.ReceiveCommand; @@ -495,42 +493,24 @@ public class BatchRefUpdate { } } if (!commands2.isEmpty()) { - // What part of the name space is already taken - Collection<String> takenNames = refdb.getRefs().stream() - .map(Ref::getName) - .collect(toCollection(HashSet::new)); - Collection<String> takenPrefixes = getTakenPrefixes(takenNames); - - // Now to the update that may require more room in the name space + // Perform updates that may require more room in the name space for (ReceiveCommand cmd : commands2) { try { if (cmd.getResult() == NOT_ATTEMPTED) { cmd.updateType(walk); RefUpdate ru = newUpdate(cmd); - SWITCH: switch (cmd.getType()) { - case DELETE: - // Performed in the first phase - break; - case UPDATE: - case UPDATE_NONFASTFORWARD: - RefUpdate ruu = newUpdate(cmd); - cmd.setResult(ruu.update(walk)); - break; - case CREATE: - for (String prefix : getPrefixes(cmd.getRefName())) { - if (takenNames.contains(prefix)) { - cmd.setResult(Result.LOCK_FAILURE); - break SWITCH; - } - } - if (takenPrefixes.contains(cmd.getRefName())) { - cmd.setResult(Result.LOCK_FAILURE); - break SWITCH; - } - ru.setCheckConflicting(false); - takenPrefixes.addAll(getPrefixes(cmd.getRefName())); - takenNames.add(cmd.getRefName()); - cmd.setResult(ru.update(walk)); + switch (cmd.getType()) { + case DELETE: + // Performed in the first phase + break; + case UPDATE: + case UPDATE_NONFASTFORWARD: + RefUpdate ruu = newUpdate(cmd); + cmd.setResult(ruu.update(walk)); + break; + case CREATE: + cmd.setResult(ru.update(walk)); + break; } } } catch (IOException err) { @@ -602,14 +582,6 @@ public class BatchRefUpdate { execute(walk, monitor, null); } - private static Collection<String> getTakenPrefixes(Collection<String> names) { - Collection<String> ref = new HashSet<>(); - for (String name : names) { - addPrefixesTo(name, ref); - } - return ref; - } - /** * Get all path prefixes of a ref name. * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/BinaryDeltaInputStream.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/BinaryDeltaInputStream.java index 7f0d87f0da..9eceeb8117 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/BinaryDeltaInputStream.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/BinaryDeltaInputStream.java @@ -82,6 +82,11 @@ public class BinaryDeltaInputStream extends InputStream { return b; } + @Override + public int read(byte[] b, int off, int len) throws IOException { + return super.read(b, off, len); + } + private void initialize() throws IOException { long baseSize = readVarInt(delta); if (baseSize > Integer.MAX_VALUE || baseSize < 0 diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/BinaryHunkInputStream.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/BinaryHunkInputStream.java index 57b2d7a4b2..4f940d77a0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/BinaryHunkInputStream.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/BinaryHunkInputStream.java @@ -59,6 +59,11 @@ public class BinaryHunkInputStream extends InputStream { } @Override + public int read(byte[] b, int off, int len) throws IOException { + return super.read(b, off, len); + } + + @Override public void close() throws IOException { in.close(); buffer = null; @@ -18,7 +18,7 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> <packaging>pom</packaging> - <version>5.12.0-SNAPSHOT</version> + <version>5.12.1-SNAPSHOT</version> <name>JGit - Parent</name> <url>${jgit-url}</url> @@ -162,7 +162,7 @@ <commons-compress-version>1.19</commons-compress-version> <osgi-core-version>4.3.1</osgi-core-version> <servlet-api-version>3.1.0</servlet-api-version> - <jetty-version>9.4.40.v20210413</jetty-version> + <jetty-version>9.4.41.v20210516</jetty-version> <japicmp-version>0.15.3</japicmp-version> <httpclient-version>4.5.13</httpclient-version> <httpcore-version>4.4.14</httpcore-version> |