diff options
121 files changed, 1276 insertions, 903 deletions
@@ -174,8 +174,8 @@ maven_jar( maven_jar( name = "commons-lang3", - artifact = "org.apache.commons:commons-lang3:3.16.0", - sha1 = "3eb54effe40946dfb06dc5cd6c7ce4116cd51ea4", + artifact = "org.apache.commons:commons-lang3:3.17.0", + sha1 = "b17d2136f0460dcc0d2016ceefca8723bdf4ee70", ) maven_jar( @@ -210,8 +210,8 @@ maven_jar( maven_jar( name = "mockito", - artifact = "org.mockito:mockito-core:5.12.0", - sha1 = "22f8bbaf478e6789164787fa411a3b5ed986e110", + artifact = "org.mockito:mockito-core:5.13.0", + sha1 = "bb2ba38657ce6fa72a13d96009d0b3bb9d7ddc1e", ) maven_jar( @@ -220,18 +220,18 @@ maven_jar( sha1 = "0d26263eb7524252d98e602fc6942996a3195e29", ) -BYTE_BUDDY_VERSION = "1.15.0" +BYTE_BUDDY_VERSION = "1.15.1" maven_jar( name = "bytebuddy", artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "a5b1159b91c5334015de0f22ab4b1188cd42bbff", + sha1 = "3072da2184d49cf642d22badee2ce36b2d6dfb92", ) maven_jar( name = "bytebuddy-agent", artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "e32740c43acebaac9d55b86399ecf6a5df3c17fb", + sha1 = "d5c8cbe2c1b94a5efa3f9f0736e1b3f00b5f6103", ) maven_jar( @@ -246,62 +246,62 @@ maven_jar( sha1 = "527175ca6d81050b53bdd4c457a6d6e017626b0e", ) -JETTY_VER = "12.0.12" +JETTY_VER = "12.0.13" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty.ee10:jetty-ee10-servlet:" + JETTY_VER, - sha1 = "12f25f260a8f9fb519b6d3058260564277e618cd", - src_sha1 = "16a22f6ed585c6dcab07d111de290301373db1c7", + sha1 = "e1cb00629ed0d4091caad7e4ee542878d60978d2", + src_sha1 = "15c9b6eced1fc9fb55450b43410acdef03903282", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "962d2c5748f750aae667399481915bd02a9746e0", - src_sha1 = "e953d0e19e6e420f5e7c1f62424c4bbe0d385d15", + sha1 = "c71b4755750198d3639cd26b55c32c87be568cce", + src_sha1 = "6a181480c9c2075abfb75d03abf0ff00a7545e58", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "77591ab10113d7de7eb8a01bb4d9d23b234aebd1", - src_sha1 = "952873398a59bc5a964d9d2d130227af807559e9", + sha1 = "f7e2f539dacb3426fef1bcd66ca7a5c13d5f6409", + src_sha1 = "be6cb0c0c3a7abc9b835fe1c918af3fef9cb3689", ) maven_jar( name = "jetty-session", artifact = "org.eclipse.jetty:jetty-session:" + JETTY_VER, - sha1 = "fceae460fb4677a6cec80d3b70b1fc3ae2a114a7", - src_sha1 = "ba95d5e17a3d7f09ca908d4c0773e913f3612425", + sha1 = "dd79f830f79bd827ba8d7c9e3fd35e03315afbd8", + src_sha1 = "970836d155c4b5e6d273ad32d40a384ceda2f2e8", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "549fe58ae50b9c061d09803fb0d2659a93ce0ecd", - src_sha1 = "c7afad980b9eade12b473172a9d069d96d016677", + sha1 = "4cc207e1006a747796cb99072087d58182193ad8", + src_sha1 = "3e047c2f4842cf6a9e3b68db36a1a667aefa6a1d", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "4e2cd5c23e8ba550238f35c361c22ffb1e7bf00c", - src_sha1 = "42397797c496a51520900a529ba7e1b315aba768", + sha1 = "a8377234b4a3967ee9ecc65ee25ef93dcffeb0f8", + src_sha1 = "ad84fef838609a88d50a0ced859972a8f4dc0f19", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "f7b1e4f835c38d12668b426d327118e767d2f1d4", - src_sha1 = "0fdb95a123cc50f6adf4154edc5316cabca05f58", + sha1 = "ad63179e37e1037b901feaa9d7423c27f70fcdfe", + src_sha1 = "93354fb32122f3be1ea23c6c44c00bbf58ac506a", ) maven_jar( name = "jetty-util-ajax", artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER, - sha1 = "330e692032c82c305cd52c6a8e9bfba0f1da2555", - src_sha1 = "d6b9274b3ef0419a6ba869c828fd0c59c570cd9d", + sha1 = "d5caa4713c49aa2984505849b7bcab0c57b1d4c6", + src_sha1 = "dd4630c8b243725a6715caf268a8230ff9b6083a", ) BOUNCYCASTLE_VER = "1.78.1" diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 0cb66de275..cc2cecb6ae 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: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.ant.tasks;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index d30abbf99e..1921cf1f9d 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ant.test</artifactId> diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 6462b4db51..da001763da 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: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)" + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)" Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="7.0.1", - org.eclipse.jgit.ant.tasks;version="7.0.1"; +Export-Package: org.eclipse.jgit.ant;version="7.1.0", + org.eclipse.jgit.ant.tasks;version="7.1.0"; uses:="org.apache.tools.ant, org.apache.tools.ant.types" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index da8d666c7a..4bac377fbf 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: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 6e629c6b82..805d2fb94b 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ant</artifactId> diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 45953f657d..0c07d5f5a1 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: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -13,18 +13,18 @@ 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="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.osgi.framework;version="[1.3.0,2.0.0)", org.tukaani.xz Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="7.0.1"; +Export-Package: org.eclipse.jgit.archive;version="7.1.0"; uses:="org.apache.commons.compress.archivers, org.osgi.framework, org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.archive.internal;version="7.0.1";x-internal:=true + org.eclipse.jgit.archive.internal;version="7.1.0";x-internal:=true diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 25660aea16..cb710c0daf 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: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index c4cc0d2f90..3c01f2ad75 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.archive</artifactId> diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index ab9f6e7856..e0fb94085d 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.benchmarks</artifactId> diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 2011268bb2..dde8c148d9 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -27,88 +27,88 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ant</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.archive</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.apache</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.server</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs.server</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.pgm</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ui</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ssh.apache</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.test</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ant.test</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.test</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.pgm.test</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs.test</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs.server.test</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ssh.apache.test</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 701f2eb512..c71f9b6541 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: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -13,9 +13,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="[7.0.1,7.1.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.sha1;version="[7.0.1,7.1.0)", + org.eclipse.jgit.gpg.bc.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.sha1;version="[7.1.0,7.2.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 3a5384256d..c4442b9fbf 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.gpg.bc.test</artifactId> diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index a301e2fae5..6e3321ebf6 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="[7.0.1,7.1.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", @@ -29,5 +29,5 @@ Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)", org.bouncycastle.util.io;version="[1.69.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.0.1";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="7.0.1";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.1.0";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="7.1.0";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 27b9308b40..82690f8520 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: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 42ebec7f66..1a541c5b02 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.gpg.bc</artifactId> diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index e7ff8a694d..d678a1e444 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: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor @@ -26,11 +26,11 @@ Import-Package: javax.net.ssl, 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="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="7.0.1"; + org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="7.1.0"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 5b68ebe1ad..cd70e113cd 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: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index d2258b3aa4..7b0f5d365d 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.apache</artifactId> diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index e30a76025f..23eb132afd 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="7.0.1", - org.eclipse.jgit.http.server.glue;version="7.0.1"; +Export-Package: org.eclipse.jgit.http.server;version="7.1.0", + org.eclipse.jgit.http.server.glue;version="7.1.0"; uses:="jakarta.servlet, jakarta.servlet.http", - org.eclipse.jgit.http.server.resolver;version="7.0.1"; + org.eclipse.jgit.http.server.resolver;version="7.1.0"; uses:="jakarta.servlet.http org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, @@ -19,14 +19,14 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", - org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)" + org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.resolver;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.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 fee2336132..02fd70b8d7 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: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 1cc54cc0ee..f69febd1f3 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.server</artifactId> diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index d2fc327de7..58245d3404 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: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -29,26 +29,26 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.http.server;version="[7.0.1,7.1.0)", - org.eclipse.jgit.http.server.glue;version="[7.0.1,7.1.0)", - org.eclipse.jgit.http.server.resolver;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http.apache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.http.server;version="[7.1.0,7.2.0)", + org.eclipse.jgit.http.server.glue;version="[7.1.0,7.2.0)", + org.eclipse.jgit.http.server.resolver;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http.apache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.resolver;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.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)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 4c9a529fcb..9e7ea160ba 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.test</artifactId> diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index fe369bcb39..1e8eec0ac0 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: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -22,17 +22,17 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.ssl;version="[12.0.0,13.0.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.http.server;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.1,7.1.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.http.server;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.resolver;version="[7.1.0,7.2.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="7.0.1"; +Export-Package: org.eclipse.jgit.junit.http;version="7.1.0"; uses:="org.eclipse.jgit.transport, jakarta.servlet, jakarta.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 e81c084490..ef53b03cba 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: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index d4ff8eead5..4fdc9f9694 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit.http</artifactId> diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 0e8091396d..aed8eda17c 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: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.13.2,2.14.0)", org.apache.sshd.server.subsystem;version="[2.13.2,2.14.0)", org.apache.sshd.sftp;version="[2.13.2,2.14.0)", org.apache.sshd.sftp.server;version="[2.13.2,2.14.0)", - org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.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,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="7.0.1" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.1.0" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 95c7a36cb1..9ce8de90b9 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: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index d98a0f1507..2e74ff506b 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit.ssh</artifactId> diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 9a445f75dd..744309749d 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,36 +3,36 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.dircache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.util;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.merge;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="7.0.1", - org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.time;version="[7.0.1,7.1.0)", +Import-Package: org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.dircache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.merge;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="7.1.0", + org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.time;version="[7.1.0,7.2.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,3.0.0)" -Export-Package: org.eclipse.jgit.junit;version="7.0.1"; +Export-Package: org.eclipse.jgit.junit;version="7.1.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -45,4 +45,4 @@ Export-Package: org.eclipse.jgit.junit;version="7.0.1"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="7.0.1";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="7.1.0";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 0b2f7ff059..1e41d0819f 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: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index f84ee783cc..af83647318 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit</artifactId> diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 118c68f633..5b6870d597 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: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -26,24 +26,24 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.server;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.test;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.server;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.test;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 91200618e4..968078a644 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs.server.test</artifactId> diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index cd45ec8f43..56178d05fd 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: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="7.0.1"; +Export-Package: org.eclipse.jgit.lfs.server;version="7.1.0"; uses:="jakarta.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="7.0.1"; + org.eclipse.jgit.lfs.server.fs;version="7.1.0"; uses:="jakarta.servlet, jakarta.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="7.0.1";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="7.0.1"; + org.eclipse.jgit.lfs.server.internal;version="7.1.0";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="7.1.0"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -24,15 +24,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", jakarta.servlet.annotation;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http.apache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http.apache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.slf4j;version="[1.7.0,3.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 b4bb8581a6..796db2ca59 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: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 6433cb8183..297ee3d28d 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs.server</artifactId> diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 08c3b6c5c6..0aa081ff6f 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,27 +3,27 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.attributes;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", +Import-Package: org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.attributes;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="7.0.1";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="7.1.0";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 9941c79205..42547756dc 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs.test</artifactId> diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index a249afe290..f24ea1bc60 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,32 +3,32 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="7.0.1", - org.eclipse.jgit.lfs.errors;version="7.0.1", - org.eclipse.jgit.lfs.internal;version="7.0.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="7.0.1" +Export-Package: org.eclipse.jgit.lfs;version="7.1.0", + org.eclipse.jgit.lfs.errors;version="7.1.0", + org.eclipse.jgit.lfs.internal;version="7.1.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="7.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", - org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.attributes;version="[7.0.1,7.1.0)", - org.eclipse.jgit.diff;version="[7.0.1,7.1.0)", - org.eclipse.jgit.dircache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.hooks;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.pack;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)" + org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.attributes;version="[7.1.0,7.2.0)", + org.eclipse.jgit.diff;version="[7.1.0,7.2.0)", + org.eclipse.jgit.dircache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.hooks;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.pack;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 7719266733..066068378b 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: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 377d91ff6b..134556d081 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs</artifactId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index da3c62ed63..e971a9a608 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="7.0.1.qualifier" + version="7.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 0fb58eb4cb..1d16f52428 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 399bab2426..aabda306e9 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="7.0.1.qualifier" + version="7.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import plugin="org.eclipse.jgit" version="7.0.1" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="7.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 81aa76a891..686e561621 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index f701d8c32b..7a797e7762 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="7.0.1.qualifier" + version="7.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import plugin="org.eclipse.jgit" version="7.0.1" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="7.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 3585cab9a8..7ab15719d1 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 73a6a0e826..fc73ea87c1 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="7.0.1.qualifier" + version="7.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -24,7 +24,7 @@ <requires> <import plugin="com.jcraft.jsch"/> - <import plugin="org.eclipse.jgit" version="7.0.1" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="7.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 6f5ff16c85..458b99e35e 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index fd7a8617b1..2aa2979b65 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="7.0.1.qualifier" + version="7.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import feature="org.eclipse.jgit" version="7.0.1" match="equivalent"/> + <import feature="org.eclipse.jgit" version="7.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 66de00edc3..a3cdc4af05 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index f575459e59..509f68834e 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="7.0.1.qualifier" + version="7.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -35,9 +35,9 @@ version="0.0.0"/> <requires> - <import feature="org.eclipse.jgit" version="7.0.1" match="equivalent"/> - <import feature="org.eclipse.jgit.lfs" version="7.0.1" match="equivalent"/> - <import feature="org.eclipse.jgit.ssh.apache" version="7.0.1" match="equivalent"/> + <import feature="org.eclipse.jgit" version="7.1.0" match="equivalent"/> + <import feature="org.eclipse.jgit.lfs" version="7.1.0" match="equivalent"/> + <import feature="org.eclipse.jgit.ssh.apache" version="7.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 3743de5d18..09d8053267 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 3f1f3da12c..711e5b9421 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.repository</artifactId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index a1c39415ce..e774a47fcb 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="7.0.1.qualifier" + version="7.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import feature="org.eclipse.jgit" version="7.0.1" match="equivalent"/> + <import feature="org.eclipse.jgit" version="7.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 2ea1117521..7fafa3bbde 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> @@ -30,7 +30,7 @@ <dependency> <groupId>org.eclipse.jgit.feature</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index a4f28246da..d550bbbe05 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="7.0.1.qualifier" + version="7.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import feature="org.eclipse.jgit" version="7.0.1" match="equivalent"/> + <import feature="org.eclipse.jgit" version="7.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 5e9771fc85..ce1d446d7f 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 7726ca7f0c..88a8fd5635 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="7.0.1.qualifier" + version="7.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import plugin="org.eclipse.jgit" version="7.0.1" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="7.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index f77d2bc58f..195e286499 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> 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 e996aebab1..07e1c2f077 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,7 +1,7 @@ <?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="1724850720"> +<target name="jgit-4.17" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> 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 cd4f935941..5dd884cbfb 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,7 +1,7 @@ <?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="1724850721"> +<target name="jgit-4.18" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> 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 01e8071026..5088be0848 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,7 +1,7 @@ <?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="1724850720"> +<target name="jgit-4.19-staging" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target index 7dbb163db0..e87a5f77c5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.20" sequenceNumber="1724850720"> +<target name="jgit-4.20" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target index 985fee0dee..ec4007fab7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.21" sequenceNumber="1724850720"> +<target name="jgit-4.21" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target index afd61cf717..7d91de1a22 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.22" sequenceNumber="1724850719"> +<target name="jgit-4.22" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target index 0309d2f844..800f224b79 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.23" sequenceNumber="1724850719"> +<target name="jgit-4.23" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target index 0ed6d80ca9..9054d9837a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.24" sequenceNumber="1724850719"> +<target name="jgit-4.24" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target index b081af4a10..f00b2804b7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.25" sequenceNumber="1724850719"> +<target name="jgit-4.25" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target index 5874693f6b..29d93c66a5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.26" sequenceNumber="1724850719"> +<target name="jgit-4.26" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index e192b624b3..d9f6e4eab6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.27" sequenceNumber="1724850719"> +<target name="jgit-4.27" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 3875520cb4..9504b7f69d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.28" sequenceNumber="1724850719"> +<target name="jgit-4.28" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 01ae4ac550..4cbb5bfda6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.29" sequenceNumber="1724850719"> +<target name="jgit-4.29" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 1651587a13..81a693b2ee 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.30" sequenceNumber="1724850719"> +<target name="jgit-4.30" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 9141303103..ac8bb77891 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.31" sequenceNumber="1724850719"> +<target name="jgit-4.31" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 26524a9aa2..afc27a4d9f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.32" sequenceNumber="1724850719"> +<target name="jgit-4.32" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 8591802f38..baa4d04c89 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.33" sequenceNumber="1724850720"> +<target name="jgit-4.33" sequenceNumber="1726128584"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -30,7 +30,7 @@ </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.osgi" version="0.0.0"/> - <repository location="https://download.eclipse.org/staging/2024-09/"/> + <repository location="https://download.eclipse.org/releases/2024-09/"/> </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="xz"> <dependencies> @@ -79,7 +79,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> <type>jar</type> </dependency> </dependencies> @@ -105,49 +105,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.10</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.12</version> + <version>12.0.13</version> <type>jar</type> </dependency> <dependency> @@ -193,13 +193,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.15.0</version> + <version>1.15.1</version> <type>jar</type> </dependency> </dependencies> @@ -269,7 +269,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.16.0</version> + <version>3.17.0</version> <type>jar</type> </dependency> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.tpd index d01a8a98ba..74c687834b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.tpd @@ -3,6 +3,6 @@ target "jgit-4.33" with source configurePhase include "orbit/orbit-4.33.tpd" include "maven/dependencies.tpd" -location "https://download.eclipse.org/staging/2024-09/" { +location "https://download.eclipse.org/releases/2024-09/" { org.eclipse.osgi lazy } diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target new file mode 100644 index 0000000000..4c639912b0 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -0,0 +1,290 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde?> +<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> +<target name="jgit-4.34" sequenceNumber="1726128584"> + <locations> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> + <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/> + <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/> + <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/> + <unit id="org.apache.ant" version="1.10.15.v20240901-1000"/> + <unit id="org.apache.ant.source" version="1.10.15.v20240901-1000"/> + <unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/> + <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/> + <unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/> + <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16"/> + <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.core.source" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.library.source" version="1.3.0.v20230809-1000"/> + <unit id="org.junit" version="4.13.2.v20230809-1000"/> + <unit id="org.junit.source" version="4.13.2.v20230809-1000"/> + <unit id="org.objenesis" version="3.4.0"/> + <unit id="org.objenesis.source" version="3.4.0"/> + <unit id="org.osgi.service.cm" version="1.6.1.202109301733"/> + <unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/> + <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.eclipse.osgi" version="0.0.0"/> + <repository location="https://download.eclipse.org/staging/2024-12/"/> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="xz"> + <dependencies> + <dependency> + <groupId>org.tukaani</groupId> + <artifactId>xz</artifactId> + <version>1.10</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="sshd"> + <dependencies> + <dependency> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-osgi</artifactId> + <version>2.13.2</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-sftp</artifactId> + <version>2.13.2</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.13.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> + <dependencies> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <version>5.14.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna-platform</artifactId> + <version>5.14.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> + <version>12.0.13</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>12.0.13</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>12.0.13</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>12.0.13</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>12.0.13</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-session</artifactId> + <version>12.0.13</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>12.0.13</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>12.0.13</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>6.1.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="javaewah"> + <dependencies> + <dependency> + <groupId>com.googlecode.javaewah</groupId> + <artifactId>JavaEWAH</artifactId> + <version>1.2.3</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="hamcrest"> + <dependencies> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + <version>2.2</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="gson"> + <dependencies> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.11.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> + <dependencies> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy</artifactId> + <version>1.15.1</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy-agent</artifactId> + <version>1.15.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> + <dependencies> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpg-jdk18on</artifactId> + <version>1.78.1</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + <version>1.78.1</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk18on</artifactId> + <version>1.78.1</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcutil-jdk18on</artifactId> + <version>1.78.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="assertj"> + <dependencies> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>3.26.3</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="args4j"> + <dependencies> + <dependency> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> + <version>2.37</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache"> + <dependencies> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.17.1</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <version>1.27.1</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.17.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.16.1</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.3.4</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + </locations> +</target> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.tpd new file mode 100644 index 0000000000..4c38371748 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.tpd @@ -0,0 +1,8 @@ +target "jgit-4.34" with source configurePhase + +include "orbit/orbit-4.34.tpd" +include "maven/dependencies.tpd" + +location "https://download.eclipse.org/staging/2024-12/" { + org.eclipse.osgi lazy +} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 8718535c78..7be7141516 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -20,7 +20,7 @@ maven apache dependency { groupId = "org.apache.commons" artifactId = "commons-lang3" - version = "3.16.0" + version = "3.17.0" } dependency { groupId = "commons-io" @@ -97,12 +97,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.15.0" + version = "1.15.1" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.15.0" + version = "1.15.1" } } @@ -154,42 +154,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.0.10" + version = "12.0.13" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.12" + version = "12.0.13" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.12" + version = "12.0.13" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.12" + version = "12.0.13" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.12" + version = "12.0.13" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.12" + version = "12.0.13" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.12" + version = "12.0.13" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.12" + version = "12.0.13" } dependency { groupId = "jakarta.servlet" @@ -225,7 +225,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.12.0" + version = "5.13.0" } } diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd new file mode 100644 index 0000000000..83ac838340 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd @@ -0,0 +1,27 @@ +target "orbit-4.34" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12" { + com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + net.i2p.crypto.eddsa [0.3.0,0.3.0] + net.i2p.crypto.eddsa.source [0.3.0,0.3.0] + org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.httpcomponents.httpclient [4.5.14,4.5.14] + org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] + org.apache.httpcomponents.httpcore [4.4.16,4.4.16] + org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.junit [4.13.2.v20230809-1000,4.13.2.v20230809-1000] + org.junit.source [4.13.2.v20230809-1000,4.13.2.v20230809-1000] + org.objenesis [3.4,3.4] + org.objenesis.source [3.4,3.4] + org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] +} diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index fac003cc82..aba1324d05 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>JGit Tycho Parent</name> diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 8b7092e1fd..7054afcb27 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,30 +3,30 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.diff;version="[7.0.1,7.1.0)", - org.eclipse.jgit.dircache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.merge;version="[7.0.1,7.1.0)", - org.eclipse.jgit.pgm;version="[7.0.1,7.1.0)", - org.eclipse.jgit.pgm.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.pgm.opt;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)", +Import-Package: org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.diff;version="[7.1.0,7.2.0)", + org.eclipse.jgit.dircache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.merge;version="[7.1.0,7.2.0)", + org.eclipse.jgit.pgm;version="[7.1.0,7.2.0)", + org.eclipse.jgit.pgm.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.pgm.opt;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)", org.hamcrest.core;bundle-version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index f9aea04f72..1b67e0ae5b 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm.test</artifactId> diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 8b1d53a5b0..26717ff61c 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: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,49 +14,49 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.server.handler;version="[12.0.0,13.0.0)", org.eclipse.jetty.util;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.archive;version="[7.0.1,7.1.0)", - org.eclipse.jgit.awtui;version="[7.0.1,7.1.0)", - org.eclipse.jgit.blame;version="[7.0.1,7.1.0)", - org.eclipse.jgit.diff;version="[7.0.1,7.1.0)", - org.eclipse.jgit.dircache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.gitrepo;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.io;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.server;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.server.s3;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.merge;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.notes;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revplot;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.pack;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http.apache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.sshd;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.archive;version="[7.1.0,7.2.0)", + org.eclipse.jgit.awtui;version="[7.1.0,7.2.0)", + org.eclipse.jgit.blame;version="[7.1.0,7.2.0)", + org.eclipse.jgit.diff;version="[7.1.0,7.2.0)", + org.eclipse.jgit.dircache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.gitrepo;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.io;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.server;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.server.s3;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.merge;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.notes;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revplot;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.pack;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http.apache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.resolver;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.sshd;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.0,7.2.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="7.0.1"; +Export-Package: org.eclipse.jgit.console;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="7.0.1"; + org.eclipse.jgit.pgm;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -68,14 +68,14 @@ Export-Package: org.eclipse.jgit.console;version="7.0.1"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="7.0.1"; + org.eclipse.jgit.pgm.debug;version="7.1.0"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="7.0.1"; + org.eclipse.jgit.pgm.internal;version="7.1.0"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="7.0.1"; + org.eclipse.jgit.pgm.opt;version="7.1.0"; uses:="org.kohsuke.args4j, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index d7f0ba4a08..69f703fe12 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: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 5055f39040..32736cfab8 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm</artifactId> diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java index c95f1384e8..74e322ff7f 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java @@ -31,6 +31,7 @@ import org.eclipse.jgit.pgm.Command; import org.eclipse.jgit.pgm.TextBuiltin; import org.eclipse.jgit.revwalk.RevObject; import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.storage.pack.PackConfig; import org.eclipse.jgit.util.TemporaryBuffer; import org.kohsuke.args4j.Argument; @@ -68,7 +69,7 @@ class ShowPackDelta extends TextBuiltin { ObjectReuseAsIs asis = (ObjectReuseAsIs) reader; ObjectToPack target = asis.newObjectToPack(obj, obj.getType()); - PackWriter pw = new PackWriter(reader) { + PackWriter pw = new PackWriter(new PackConfig(), reader) { @Override public void select(ObjectToPack otp, StoredObjectRepresentation next) { otp.select(next); diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 096eb332eb..107d3dc814 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.1,7.1.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.1.0,7.2.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.transport.sshd;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)" Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)", com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" -Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.0.1";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.1.0";x-internal:=true diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 826108fd1f..6d42144623 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 3c5f39fc78..6c99ff97e1 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.apache.agent</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 d9b0e1b901..1f8edac3a8 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: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -22,16 +22,16 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.13.2,2.14.0)", org.apache.sshd.core;version="[2.13.2,2.14.0)", org.apache.sshd.server;version="[2.13.2,2.14.0)", org.apache.sshd.server.forward;version="[2.13.2,2.14.0)", - org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit.ssh;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.sshd;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit.ssh;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.sshd;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.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 175119eab2..b3e3d31eea 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.apache.test</artifactId> diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 4ddb3ad7f0..9544c5f74a 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.1";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-internal:=true; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -23,18 +23,18 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.1";x-inter org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="7.0.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="7.0.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.0.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="7.0.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.transport.sshd;version="7.0.1"; + org.eclipse.jgit.internal.transport.sshd.agent;version="7.1.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="7.1.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.1.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="7.1.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.transport.sshd;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="7.0.1", + org.eclipse.jgit.transport.sshd.agent;version="7.1.0", sun.security.x509 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.agent;version="[2.13.2,2.14.0)", @@ -89,12 +89,12 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.sftp;version="[2.13.2,2.14.0)", org.apache.sshd.sftp.client;version="[2.13.2,2.14.0)", org.apache.sshd.sftp.common;version="[2.13.2,2.14.0)", - org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.fnmatch;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.fnmatch;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.slf4j;version="[1.7.0,3.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 2db55a3fc2..d39f45f342 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: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 993a163c33..da42323474 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.apache</artifactId> diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 8192be0cc3..0e1e396c7d 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ 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: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit.ssh;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit.ssh;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.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 e4873e4067..e141c7e7f3 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.jsch.test</artifactId> diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 8092a58aa5..4e004ea95e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ 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="[7.0.1,7.1.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.1" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.1.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)", org.slf4j;version="[1.7.0,3.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 d5121038e1..675754cda6 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: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 2bd78a3c19..51252ee7b7 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.jsch</artifactId> diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 96b9e35a6c..a992c24509 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: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -21,64 +21,64 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.io;version="[2.15.0,3.0.0)", org.apache.commons.io.output;version="[2.15.0,3.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.archive;version="[7.0.1,7.1.0)", - org.eclipse.jgit.attributes;version="[7.0.1,7.1.0)", - org.eclipse.jgit.awtui;version="[7.0.1,7.1.0)", - org.eclipse.jgit.blame;version="[7.0.1,7.1.0)", - org.eclipse.jgit.diff;version="[7.0.1,7.1.0)", - org.eclipse.jgit.dircache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.events;version="[7.0.1,7.1.0)", - org.eclipse.jgit.fnmatch;version="[7.0.1,7.1.0)", - org.eclipse.jgit.gitrepo;version="[7.0.1,7.1.0)", - org.eclipse.jgit.hooks;version="[7.0.1,7.1.0)", - org.eclipse.jgit.ignore;version="[7.0.1,7.1.0)", - org.eclipse.jgit.ignore.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.diff;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.fsck;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="7.0.1", - org.eclipse.jgit.internal.storage.dfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.io;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.memory;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit.time;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.logging;version="[7.0.1,7.1.0)", - org.eclipse.jgit.merge;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.notes;version="[7.0.1,7.1.0)", - org.eclipse.jgit.patch;version="[7.0.1,7.1.0)", - org.eclipse.jgit.pgm;version="[7.0.1,7.1.0)", - org.eclipse.jgit.pgm.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revplot;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.pack;version="[7.0.1,7.1.0)", - org.eclipse.jgit.submodule;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.sha1;version="[7.0.1,7.1.0)", + org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.archive;version="[7.1.0,7.2.0)", + org.eclipse.jgit.attributes;version="[7.1.0,7.2.0)", + org.eclipse.jgit.awtui;version="[7.1.0,7.2.0)", + org.eclipse.jgit.blame;version="[7.1.0,7.2.0)", + org.eclipse.jgit.diff;version="[7.1.0,7.2.0)", + org.eclipse.jgit.dircache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.events;version="[7.1.0,7.2.0)", + org.eclipse.jgit.fnmatch;version="[7.1.0,7.2.0)", + org.eclipse.jgit.gitrepo;version="[7.1.0,7.2.0)", + org.eclipse.jgit.hooks;version="[7.1.0,7.2.0)", + org.eclipse.jgit.ignore;version="[7.1.0,7.2.0)", + org.eclipse.jgit.ignore.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.diff;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.fsck;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="7.1.0", + org.eclipse.jgit.internal.storage.dfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.io;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.memory;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit.time;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.logging;version="[7.1.0,7.2.0)", + org.eclipse.jgit.merge;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.notes;version="[7.1.0,7.2.0)", + org.eclipse.jgit.patch;version="[7.1.0,7.2.0)", + org.eclipse.jgit.pgm;version="[7.1.0,7.2.0)", + org.eclipse.jgit.pgm.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revplot;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.pack;version="[7.1.0,7.2.0)", + org.eclipse.jgit.submodule;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.resolver;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.sha1;version="[7.1.0,7.2.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 272d784c71..f925a282d6 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.test</artifactId> diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java index bc851f8dde..9680019f88 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java @@ -41,6 +41,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.storage.pack.PackConfig; import org.eclipse.jgit.transport.ReceiveCommand; import org.junit.Before; import org.junit.Test; @@ -309,7 +310,7 @@ public class DfsPackFileTest { private void assertPackSize() throws IOException { try (DfsReader ctx = db.getObjectDatabase().newReader(); - PackWriter pw = new PackWriter(ctx); + PackWriter pw = new PackWriter(new PackConfig(), ctx); ByteArrayOutputStream os = new ByteArrayOutputStream(); PackOutputStream out = new PackOutputStream( NullProgressMonitor.INSTANCE, os, pw)) { diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 7568d7446c..1c15155d37 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: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.awtui;version="7.0.1" -Import-Package: org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revplot;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)" +Export-Package: org.eclipse.jgit.awtui;version="7.1.0" +Import-Package: org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revplot;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 26d3f5c7ea..0819f8024f 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: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index da3b146355..d5fe05d98e 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ui</artifactId> diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index bb0afdc62f..07188a0f16 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="7.0.1", - org.eclipse.jgit.api;version="7.0.1"; +Export-Package: org.eclipse.jgit.annotations;version="7.1.0", + org.eclipse.jgit.api;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -25,18 +25,18 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.1", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="7.0.1"; + org.eclipse.jgit.api.errors;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="7.0.1"; + org.eclipse.jgit.attributes;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="7.0.1"; + org.eclipse.jgit.blame;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="7.0.1"; + org.eclipse.jgit.diff;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, @@ -44,53 +44,53 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.1", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="7.0.1"; + org.eclipse.jgit.dircache;version="7.1.0"; uses:="org.eclipse.jgit.events, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.errors;version="7.0.1"; + org.eclipse.jgit.errors;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack", - org.eclipse.jgit.events;version="7.0.1"; + org.eclipse.jgit.events;version="7.1.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="7.0.1", - org.eclipse.jgit.gitrepo;version="7.0.1"; + org.eclipse.jgit.fnmatch;version="7.1.0", + org.eclipse.jgit.gitrepo;version="7.1.0"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="7.0.1";x-internal:=true, - org.eclipse.jgit.hooks;version="7.0.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="7.0.1", - org.eclipse.jgit.ignore.internal;version="7.0.1"; + org.eclipse.jgit.gitrepo.internal;version="7.1.0";x-internal:=true, + org.eclipse.jgit.hooks;version="7.1.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="7.1.0", + org.eclipse.jgit.ignore.internal;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="7.0.1"; + org.eclipse.jgit.internal;version="7.1.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="7.0.1"; + org.eclipse.jgit.internal.diff;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="7.0.1"; + org.eclipse.jgit.internal.diffmergetool;version="7.1.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.internal.fsck;version="7.0.1"; + org.eclipse.jgit.internal.fsck;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="7.0.1"; + org.eclipse.jgit.internal.revwalk;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="7.0.1"; + org.eclipse.jgit.internal.storage.commitgraph;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="7.0.1"; + org.eclipse.jgit.internal.storage.dfs;version="7.1.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="7.0.1"; + org.eclipse.jgit.internal.storage.file;version="7.1.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -99,36 +99,36 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.1", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="7.0.1"; + org.eclipse.jgit.internal.storage.io;version="7.1.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="7.0.1"; + org.eclipse.jgit.internal.storage.memory;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.pack;version="7.0.1"; + org.eclipse.jgit.internal.storage.pack;version="7.1.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="7.0.1"; + org.eclipse.jgit.internal.storage.reftable;version="7.1.0"; x-friends:="org.eclipse.jgit.http.test, org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.submodule;version="7.0.1";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="7.0.1"; + org.eclipse.jgit.internal.submodule;version="7.1.0";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="7.0.1"; + org.eclipse.jgit.internal.transport.http;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="7.0.1"; + org.eclipse.jgit.internal.transport.parser;version="7.1.0"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="7.0.1"; + org.eclipse.jgit.internal.transport.ssh;version="7.1.0"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.internal.util;version="7.0.1"; + org.eclipse.jgit.internal.util;version="7.1.0"; x-friends:=" org.eclipse.jgit.junit", - org.eclipse.jgit.lib;version="7.0.1"; + org.eclipse.jgit.lib;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -142,12 +142,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.1", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="7.0.1"; + org.eclipse.jgit.lib.internal;version="7.1.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="7.0.1", - org.eclipse.jgit.merge;version="7.0.1"; + org.eclipse.jgit.logging;version="7.1.0", + org.eclipse.jgit.merge;version="7.1.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -156,40 +156,40 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.1", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="7.0.1", - org.eclipse.jgit.notes;version="7.0.1"; + org.eclipse.jgit.nls;version="7.1.0", + org.eclipse.jgit.notes;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="7.0.1"; + org.eclipse.jgit.patch;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="7.0.1"; + org.eclipse.jgit.revplot;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="7.0.1"; + org.eclipse.jgit.revwalk;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.treewalk", - org.eclipse.jgit.revwalk.filter;version="7.0.1"; + org.eclipse.jgit.revwalk.filter;version="7.1.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="7.0.1"; + org.eclipse.jgit.storage.file;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="7.0.1"; + org.eclipse.jgit.storage.pack;version="7.1.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="7.0.1"; + org.eclipse.jgit.submodule;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="7.0.1"; + org.eclipse.jgit.transport;version="7.1.0"; uses:="javax.crypto, org.eclipse.jgit.util.io, org.eclipse.jgit.lib, @@ -202,21 +202,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.1", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="7.0.1"; + org.eclipse.jgit.transport.http;version="7.1.0"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="7.0.1"; + org.eclipse.jgit.transport.resolver;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="7.0.1"; + org.eclipse.jgit.treewalk;version="7.1.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.treewalk.filter;version="7.0.1"; + org.eclipse.jgit.treewalk.filter;version="7.1.0"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="7.0.1"; + org.eclipse.jgit.util;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -229,12 +229,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.1", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="7.0.1"; + org.eclipse.jgit.util.io;version="7.1.0"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="7.0.1", - org.eclipse.jgit.util.time;version="7.0.1" + org.eclipse.jgit.util.sha1;version="7.1.0", + org.eclipse.jgit.util.time;version="7.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 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 2ced16481f..f78f3638bd 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: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index f01a7db3f0..e012cbc049 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>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit</artifactId> diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java index 9cfcbaa5f7..62f6753e5d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java @@ -511,18 +511,15 @@ public class DfsReader extends ObjectReader implements ObjectReuseAsIs { throw new MissingObjectException(objectId.copy(), typeHint); } - if (typeHint != Constants.OBJ_BLOB || !pack.hasObjectSizeIndex(this)) { + if (typeHint != Constants.OBJ_BLOB || !safeHasObjectSizeIndex(pack)) { return pack.getObjectSize(this, objectId); } - long sz = pack.getIndexedObjectSize(this, objectId); + Optional<Long> maybeSz = safeGetIndexedObjectSize(pack, objectId); + long sz = maybeSz.orElse(-1L); if (sz >= 0) { - stats.objectSizeIndexHit += 1; return sz; } - - // Object wasn't in the index - stats.objectSizeIndexMiss += 1; return pack.getObjectSize(this, objectId); } @@ -541,23 +538,61 @@ public class DfsReader extends ObjectReader implements ObjectReuseAsIs { } stats.isNotLargerThanCallCount += 1; - if (typeHint != Constants.OBJ_BLOB || !pack.hasObjectSizeIndex(this)) { + if (typeHint != Constants.OBJ_BLOB || !safeHasObjectSizeIndex(pack)) { + return pack.getObjectSize(this, objectId) <= limit; + } + + Optional<Long> maybeSz = safeGetIndexedObjectSize(pack, objectId); + if (maybeSz.isEmpty()) { + // Exception in object size index return pack.getObjectSize(this, objectId) <= limit; } - long sz = pack.getIndexedObjectSize(this, objectId); + long sz = maybeSz.get(); + if (sz >= 0) { + return sz <= limit; + } + + if (isLimitInsideIndexThreshold(pack, limit)) { + // With threshold T, not-found means object < T + // If limit L > T, then object < T < L + return true; + } + + return pack.getObjectSize(this, objectId) <= limit; + } + + private boolean safeHasObjectSizeIndex(DfsPackFile pack) { + try { + return pack.hasObjectSizeIndex(this); + } catch (IOException e) { + return false; + } + } + + private Optional<Long> safeGetIndexedObjectSize(DfsPackFile pack, + AnyObjectId objectId) { + long sz; + try { + sz = pack.getIndexedObjectSize(this, objectId); + } catch (IOException e) { + // Do not count the exception as an index miss + return Optional.empty(); + } if (sz < 0) { stats.objectSizeIndexMiss += 1; } else { stats.objectSizeIndexHit += 1; } + return Optional.of(sz); + } - // Got size from index or we didn't but we are sure it should be there. - if (sz >= 0 || pack.getObjectSizeIndexThreshold(this) <= limit) { - return sz <= limit; + private boolean isLimitInsideIndexThreshold(DfsPackFile pack, long limit) { + try { + return pack.getObjectSizeIndexThreshold(this) <= limit; + } catch (IOException e) { + return false; } - - return pack.getObjectSize(this, objectId) <= limit; } private DfsPackFile findPackWithObject(AnyObjectId objectId) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java index c0540d5a4c..dfea5c1c80 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java @@ -302,8 +302,9 @@ public interface PackIndex * */ class MutableEntry { + /** Buffer of the ObjectId visited by the EntriesIterator. */ final MutableObjectId idBuffer = new MutableObjectId(); - + /** Offset into the packfile of the current object. */ long offset; /** @@ -321,7 +322,6 @@ public interface PackIndex * @return hex string describing the object id of this entry. */ public String name() { - ensureId(); return idBuffer.name(); } @@ -331,7 +331,6 @@ public interface PackIndex * @return a copy of the object id. */ public ObjectId toObjectId() { - ensureId(); return idBuffer.toObjectId(); } @@ -342,32 +341,33 @@ public interface PackIndex */ public MutableEntry cloneEntry() { final MutableEntry r = new MutableEntry(); - ensureId(); r.idBuffer.fromObjectId(idBuffer); r.offset = offset; return r; } - - void ensureId() { - // Override in implementations. - } } /** * Base implementation of the iterator over index entries. */ abstract class EntriesIterator implements Iterator<MutableEntry> { - protected final MutableEntry entry = initEntry(); - private final long objectCount; + private final MutableEntry entry = new MutableEntry(); + + /** Counts number of entries accessed so far. */ + private long returnedNumber = 0; + + /** + * Construct an iterator that can move objectCount times forward. + * + * @param objectCount + * the number of objects in the PackFile. + */ protected EntriesIterator(long objectCount) { this.objectCount = objectCount; } - protected long returnedNumber = 0; - - protected abstract MutableEntry initEntry(); @Override public boolean hasNext() { @@ -379,7 +379,55 @@ public interface PackIndex * element. */ @Override - public abstract MutableEntry next(); + public MutableEntry next() { + readNext(); + returnedNumber++; + return entry; + } + + /** + * Used by subclasses to load the next entry into the MutableEntry. + * <p> + * Subclasses are expected to populate the entry with + * {@link #setIdBuffer} and {@link #setOffset}. + */ + protected abstract void readNext(); + + + /** + * Copies to the entry an {@link ObjectId} from the int buffer and + * position idx + * + * @param raw + * the raw data + * @param idx + * the index into {@code raw} + */ + protected void setIdBuffer(int[] raw, int idx) { + entry.idBuffer.fromRaw(raw, idx); + } + + /** + * Copies to the entry an {@link ObjectId} from the byte array at + * position idx. + * + * @param raw + * the raw data + * @param idx + * the index into {@code raw} + */ + protected void setIdBuffer(byte[] raw, int idx) { + entry.idBuffer.fromRaw(raw, idx); + } + + /** + * Sets the {@code offset} to the entry + * + * @param offset the offset in the pack file + */ + protected void setOffset(long offset) { + entry.offset = offset; + } @Override public void remove() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java index d7c83785d8..be48358a0d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java @@ -203,7 +203,7 @@ class PackIndexV1 implements PackIndex { @Override public Iterator<MutableEntry> iterator() { - return new IndexV1Iterator(objectCnt); + return new EntriesIteratorV1(this); } @Override @@ -246,36 +246,30 @@ class PackIndexV1 implements PackIndex { return packChecksum; } - private class IndexV1Iterator extends EntriesIterator { - int levelOne; + private static class EntriesIteratorV1 extends EntriesIterator { + private int levelOne; - int levelTwo; + private int levelTwo; - IndexV1Iterator(long objectCount) { - super(objectCount); - } + private final PackIndexV1 packIndex; - @Override - protected MutableEntry initEntry() { - return new MutableEntry() { - @Override - protected void ensureId() { - idBuffer.fromRaw(idxdata[levelOne], levelTwo - - Constants.OBJECT_ID_LENGTH); - } - }; + private EntriesIteratorV1(PackIndexV1 packIndex) { + super(packIndex.objectCnt); + this.packIndex = packIndex; } @Override - public MutableEntry next() { - for (; levelOne < idxdata.length; levelOne++) { - if (idxdata[levelOne] == null) + protected void readNext() { + for (; levelOne < packIndex.idxdata.length; levelOne++) { + if (packIndex.idxdata[levelOne] == null) continue; - if (levelTwo < idxdata[levelOne].length) { - entry.offset = NB.decodeUInt32(idxdata[levelOne], levelTwo); - levelTwo += Constants.OBJECT_ID_LENGTH + 4; - returnedNumber++; - return entry; + if (levelTwo < packIndex.idxdata[levelOne].length) { + super.setOffset(NB.decodeUInt32(packIndex.idxdata[levelOne], + levelTwo)); + this.levelTwo += Constants.OBJECT_ID_LENGTH + 4; + super.setIdBuffer(packIndex.idxdata[levelOne], + levelTwo - Constants.OBJECT_ID_LENGTH); + return; } levelTwo = 0; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java index caf8b71180..36e54fcd62 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java @@ -224,7 +224,7 @@ class PackIndexV2 implements PackIndex { @Override public Iterator<MutableEntry> iterator() { - return new EntriesIteratorV2(objectCnt); + return new EntriesIteratorV2(this); } @Override @@ -289,41 +289,34 @@ class PackIndexV2 implements PackIndex { return packChecksum; } - private class EntriesIteratorV2 extends EntriesIterator { - int levelOne; + private static class EntriesIteratorV2 extends EntriesIterator { + private int levelOne = 0; - int levelTwo; + private int levelTwo = 0; - EntriesIteratorV2(long objectCount){ - super(objectCount); - } + private final PackIndexV2 packIndex; - @Override - protected MutableEntry initEntry() { - return new MutableEntry() { - @Override - protected void ensureId() { - idBuffer.fromRaw(names[levelOne], levelTwo - - Constants.OBJECT_ID_LENGTH / 4); - } - }; + private EntriesIteratorV2(PackIndexV2 packIndex) { + super(packIndex.objectCnt); + this.packIndex = packIndex; } @Override - public MutableEntry next() { - for (; levelOne < names.length; levelOne++) { - if (levelTwo < names[levelOne].length) { + protected void readNext() { + for (; levelOne < packIndex.names.length; levelOne++) { + if (levelTwo < packIndex.names[levelOne].length) { int idx = levelTwo / (Constants.OBJECT_ID_LENGTH / 4) * 4; - long offset = NB.decodeUInt32(offset32[levelOne], idx); + long offset = NB.decodeUInt32(packIndex.offset32[levelOne], + idx); if ((offset & IS_O64) != 0) { idx = (8 * (int) (offset & ~IS_O64)); - offset = NB.decodeUInt64(offset64, idx); + offset = NB.decodeUInt64(packIndex.offset64, idx); } - entry.offset = offset; - - levelTwo += Constants.OBJECT_ID_LENGTH / 4; - returnedNumber++; - return entry; + super.setOffset(offset); + this.levelTwo += Constants.OBJECT_ID_LENGTH / 4; + super.setIdBuffer(packIndex.names[levelOne], + levelTwo - Constants.OBJECT_ID_LENGTH / 4); + return; } levelTwo = 0; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackReverseIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackReverseIndex.java index ef9753cd79..720a3bcbff 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackReverseIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackReverseIndex.java @@ -75,20 +75,20 @@ public interface PackReverseIndex { throws CorruptObjectException; /** - * Find the position in the primary index of the object at the given pack + * Find the position in the reverse index of the object at the given pack * offset. * * @param offset * the pack offset of the object - * @return the position in the primary index of the object + * @return the position in the reverse index of the object */ int findPosition(long offset); /** - * Find the object that is in the given position in the primary index. + * Find the object that is in the given position in the reverse index. * * @param nthPosition - * the position of the object in the primary index + * the position of the object in the reverse index * @return the object in that position */ ObjectId findObjectByPosition(int nthPosition); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java index 4350f97915..d3e30f3f6c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java @@ -303,19 +303,6 @@ public class PackWriter implements AutoCloseable { } /** - * Create a writer to load objects from the specified reader. - * <p> - * Objects for packing are specified in {@link #preparePack(Iterator)} or - * {@link #preparePack(ProgressMonitor, Set, Set)}. - * - * @param reader - * reader to read from the repository with. - */ - public PackWriter(ObjectReader reader) { - this(new PackConfig(), reader); - } - - /** * Create writer for specified repository. * <p> * Objects for packing are specified in {@link #preparePack(Iterator)} or diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java index 3eb35be79a..c27047f25d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java @@ -14,7 +14,6 @@ package org.eclipse.jgit.lib; import static java.nio.charset.StandardCharsets.UTF_8; -import java.nio.ByteBuffer; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.text.MessageFormat; @@ -734,17 +733,7 @@ public final class Constants { * default character encoding (UTF-8). */ public static byte[] encode(String str) { - final ByteBuffer bb = UTF_8.encode(str); - final int len = bb.limit(); - if (bb.hasArray() && bb.arrayOffset() == 0) { - final byte[] arr = bb.array(); - if (arr.length == len) - return arr; - } - - final byte[] arr = new byte[len]; - bb.get(arr); - return arr; + return str.getBytes(UTF_8); } static { @@ -18,7 +18,7 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> <packaging>pom</packaging> - <version>7.0.1-SNAPSHOT</version> + <version>7.1.0-SNAPSHOT</version> <name>JGit - Parent</name> <url>${jgit-url}</url> @@ -118,8 +118,8 @@ <project.build.outputTimestamp>${commit.time.iso}</project.build.outputTimestamp> - <jgit-last-release-version>6.10.0.202406032230-r</jgit-last-release-version> - <ant-version>1.10.14</ant-version> + <jgit-last-release-version>7.0.0.202409031743-r</jgit-last-release-version> + <ant-version>1.10.15</ant-version> <apache-sshd-version>2.13.2</apache-sshd-version> <jsch-version>0.1.55</jsch-version> <jzlib-version>1.1.3</jzlib-version> @@ -130,7 +130,7 @@ <commons-compress-version>1.27.1</commons-compress-version> <osgi-core-version>6.0.0</osgi-core-version> <servlet-api-version>6.1.0</servlet-api-version> - <jetty-version>12.0.12</jetty-version> + <jetty-version>12.0.13</jetty-version> <japicmp-version>0.21.2</japicmp-version> <httpclient-version>4.5.14</httpclient-version> <httpcore-version>4.4.16</httpcore-version> @@ -148,7 +148,7 @@ <hamcrest-version>2.2</hamcrest-version> <assertj-version>3.26.3</assertj-version> <jna-version>5.14.0</jna-version> - <byte-buddy-version>1.15.0</byte-buddy-version> + <byte-buddy-version>1.15.1</byte-buddy-version> <!-- Properties to enable jacoco code coverage analysis --> <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> @@ -1007,7 +1007,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.12.0</version> + <version>5.13.0</version> </dependency> <dependency> |