diff options
93 files changed, 547 insertions, 619 deletions
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 4ac514afb1..0069b09467 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.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.ant.tasks;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.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 4e4b39fd7c..c6c81648ae 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.1.1-SNAPSHOT</version> + <version>7.2.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 75a096720a..3af82e4759 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.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)" + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)" Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="7.1.1", - org.eclipse.jgit.ant.tasks;version="7.1.1"; +Export-Package: org.eclipse.jgit.ant;version="7.2.0", + org.eclipse.jgit.ant.tasks;version="7.2.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 3a123395f1..89d05be73b 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 157a67b7db..11806f15c6 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.1.1-SNAPSHOT</version> + <version>7.2.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 067d32754c..b142a66a8c 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.1.1.qualifier +Bundle-Version: 7.2.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.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.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.1.1"; +Export-Package: org.eclipse.jgit.archive;version="7.2.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.1.1";x-internal:=true + org.eclipse.jgit.archive.internal;version="7.2.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 e7e2799ea1..3ca6590f02 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index cf024995d8..27a2bba5a2 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.1.1-SNAPSHOT</version> + <version>7.2.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 0e267f9ed4..3079742c79 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.1.1-SNAPSHOT</version> + <version>7.2.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 5cbf6a7c3e..9493c07dbc 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.1.1-SNAPSHOT</version> + <version>7.2.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.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ant</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.archive</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.apache</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.server</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs.server</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.pgm</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ui</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ssh.apache</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.test</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ant.test</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.test</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.pgm.test</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs.test</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs.server.test</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ssh.apache.test</artifactId> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.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 a9e4bf69f7..35294256e1 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.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,9 +14,9 @@ Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.79.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.79.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.sha1;version="[7.1.1,7.2.0)", + org.eclipse.jgit.gpg.bc.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.sha1;version="[7.2.0,7.3.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 5a7cef510c..245ba7e127 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.1.1-SNAPSHOT</version> + <version>7.2.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 345461de70..2120439e51 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.1.1,7.2.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", @@ -26,5 +26,5 @@ Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.79.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.79.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.1.1";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="7.1.1";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.2.0";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="7.2.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 9c94e598bc..532e749cb2 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 0090c2b7a9..f94e2b27b1 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.1.1-SNAPSHOT</version> + <version>7.2.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 c7f914d62a..7d23d53614 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.1.1.qualifier +Bundle-Version: 7.2.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.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="7.1.1"; + org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="7.2.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 87c798111a..679252de34 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index a1c03fdf99..c390d8f5ee 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.1.1-SNAPSHOT</version> + <version>7.2.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 f826797d56..39dc2ef42a 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.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="7.1.1", - org.eclipse.jgit.http.server.glue;version="7.1.1"; +Export-Package: org.eclipse.jgit.http.server;version="7.2.0", + org.eclipse.jgit.http.server.glue;version="7.2.0"; uses:="jakarta.servlet, jakarta.servlet.http", - org.eclipse.jgit.http.server.resolver;version="7.1.1"; + org.eclipse.jgit.http.server.resolver;version="7.2.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.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.resolver;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)" + org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.resolver;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.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 cc9c765744..e7940bd358 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index f6d701c739..3f79f8b82d 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.1.1-SNAPSHOT</version> + <version>7.2.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 89f06d6cfa..3550501dba 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.1.1.qualifier +Bundle-Version: 7.2.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.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.http.server;version="[7.1.1,7.2.0)", - org.eclipse.jgit.http.server.glue;version="[7.1.1,7.2.0)", - org.eclipse.jgit.http.server.resolver;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http.apache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.resolver;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.http.server;version="[7.2.0,7.3.0)", + org.eclipse.jgit.http.server.glue;version="[7.2.0,7.3.0)", + org.eclipse.jgit.http.server.resolver;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http.apache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.resolver;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.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 6e9601e231..2f25191fee 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.1.1-SNAPSHOT</version> + <version>7.2.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 7f1a850bbb..4ba595901b 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.1.1.qualifier +Bundle-Version: 7.2.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.1.1,7.2.0)", - org.eclipse.jgit.http.server;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.resolver;version="[7.1.1,7.2.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.http.server;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.resolver;version="[7.2.0,7.3.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.1.1"; +Export-Package: org.eclipse.jgit.junit.http;version="7.2.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 dc32c8de78..5abd7d6d51 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index e7688c1068..ea38ae31ba 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.1.1-SNAPSHOT</version> + <version>7.2.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 7a99b49421..bcd9fbfc81 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.1.1.qualifier +Bundle-Version: 7.2.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.14.0,2.15.0)", org.apache.sshd.server.subsystem;version="[2.14.0,2.15.0)", org.apache.sshd.sftp;version="[2.14.0,2.15.0)", org.apache.sshd.sftp.server;version="[2.14.0,2.15.0)", - org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.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.1.1" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.2.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 a295cf26c0..b8f22cea5d 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 5fc3c6a438..f937748212 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.1.1-SNAPSHOT</version> + <version>7.2.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 e8d00d60eb..6488a887fb 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.1.1.qualifier +Bundle-Version: 7.2.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.1.1,7.2.0)", - org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.dircache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.util;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.merge;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="7.1.1", - org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.time;version="[7.1.1,7.2.0)", +Import-Package: org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.merge;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="7.2.0", + org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.time;version="[7.2.0,7.3.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.1.1"; +Export-Package: org.eclipse.jgit.junit;version="7.2.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.1.1"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="7.1.1";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="7.2.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 b5f9641f04..9d494cb2e0 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index d9ef7da365..9f43ced73b 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.1.1-SNAPSHOT</version> + <version>7.2.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 af2ad199c7..77749c8d89 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.1.1.qualifier +Bundle-Version: 7.2.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.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.server;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.test;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.server;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.test;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.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 3f0a708b57..98e63b0f1e 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.1.1-SNAPSHOT</version> + <version>7.2.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 1cdf62b450..1973b26477 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.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="7.1.1"; +Export-Package: org.eclipse.jgit.lfs.server;version="7.2.0"; uses:="jakarta.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="7.1.1"; + org.eclipse.jgit.lfs.server.fs;version="7.2.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.1.1";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="7.1.1"; + org.eclipse.jgit.lfs.server.internal;version="7.2.0";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="7.2.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.1.1,7.2.0)", - org.eclipse.jgit.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http.apache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http.apache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.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 6d10d29f60..73f5cab59d 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 839cd67f51..0dd0786050 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.1.1-SNAPSHOT</version> + <version>7.2.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 d2e3b7399e..f27377447c 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,28 +3,28 @@ 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.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.attributes;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", +Import-Package: org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.attributes;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.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.1.1";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="7.2.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 96bb01c168..eff7e0b7eb 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.1.1-SNAPSHOT</version> + <version>7.2.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 7a172cdc6e..fb211cc89c 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.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="7.1.1", - org.eclipse.jgit.lfs.errors;version="7.1.1", - org.eclipse.jgit.lfs.internal;version="7.1.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.1.1" +Export-Package: org.eclipse.jgit.lfs;version="7.2.0", + org.eclipse.jgit.lfs.errors;version="7.2.0", + org.eclipse.jgit.lfs.internal;version="7.2.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.2.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.1.1,7.2.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.attributes;version="[7.1.1,7.2.0)", - org.eclipse.jgit.diff;version="[7.1.1,7.2.0)", - org.eclipse.jgit.dircache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.hooks;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.pack;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)" + org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.attributes;version="[7.2.0,7.3.0)", + org.eclipse.jgit.diff;version="[7.2.0,7.3.0)", + org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.hooks;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.pack;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 5fb872d57a..4ca03a3f72 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 438ad28069..329740085e 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.1.1-SNAPSHOT</version> + <version>7.2.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 815c18987b..43980f06ae 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.1.1.qualifier" + version="7.2.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 e89ddb85b6..59345e75f9 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.1.1-SNAPSHOT</version> + <version>7.2.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 da380e33b7..ae91bd5405 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.1.1.qualifier" + version="7.2.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.1.1" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="7.2.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 127bcd1573..aa88700423 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.1.1-SNAPSHOT</version> + <version>7.2.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 73a9a4bfcd..57d7d8dd69 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.1.1.qualifier" + version="7.2.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.1.1" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="7.2.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 e2eabfbc91..2038cfd58c 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.1.1-SNAPSHOT</version> + <version>7.2.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 5ff30c4db3..d9a9db307d 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.1.1.qualifier" + version="7.2.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.1.1" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="7.2.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 cd302acfd7..d98990c532 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.1.1-SNAPSHOT</version> + <version>7.2.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 860c0e40b4..8f0c532a4a 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.1.1.qualifier" + version="7.2.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.1.1" match="equivalent"/> + <import feature="org.eclipse.jgit" version="7.2.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 793dce002c..7e1b0c8226 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.1.1-SNAPSHOT</version> + <version>7.2.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 2e5c2795d3..78867c96c0 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.1.1.qualifier" + version="7.2.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.1.1" match="equivalent"/> - <import feature="org.eclipse.jgit.lfs" version="7.1.1" match="equivalent"/> - <import feature="org.eclipse.jgit.ssh.apache" version="7.1.1" match="equivalent"/> + <import feature="org.eclipse.jgit" version="7.2.0" match="equivalent"/> + <import feature="org.eclipse.jgit.lfs" version="7.2.0" match="equivalent"/> + <import feature="org.eclipse.jgit.ssh.apache" version="7.2.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 663e62bfad..02435b6c08 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.1.1-SNAPSHOT</version> + <version>7.2.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 97f0600f99..d3773f54f3 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.1.1-SNAPSHOT</version> + <version>7.2.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 5243b18152..b8f402e4f0 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.1.1.qualifier" + version="7.2.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.1.1" match="equivalent"/> + <import feature="org.eclipse.jgit" version="7.2.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 0140b480a6..4eee8255cc 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.1.1-SNAPSHOT</version> + <version>7.2.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.1.1-SNAPSHOT</version> + <version>7.2.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 8cc19ae75e..811beafca6 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.1.1.qualifier" + version="7.2.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.1.1" match="equivalent"/> + <import feature="org.eclipse.jgit" version="7.2.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 8abc563f6e..025844c6b0 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.1.1-SNAPSHOT</version> + <version>7.2.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 573c19188d..a0cd57bcbb 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.1.1.qualifier" + version="7.2.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.1.1" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="7.2.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 b21e424bb8..81c9651fd9 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.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index ec4d80a195..94b56faba9 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.1.1-SNAPSHOT</version> + <version>7.2.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 c6addb57ad..60a60bb51d 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.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.diff;version="[7.1.1,7.2.0)", - org.eclipse.jgit.dircache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.merge;version="[7.1.1,7.2.0)", - org.eclipse.jgit.pgm;version="[7.1.1,7.2.0)", - org.eclipse.jgit.pgm.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.pgm.opt;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)", +Import-Package: org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.diff;version="[7.2.0,7.3.0)", + org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.merge;version="[7.2.0,7.3.0)", + org.eclipse.jgit.pgm;version="[7.2.0,7.3.0)", + org.eclipse.jgit.pgm.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.pgm.opt;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.0,7.3.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 e04c42b629..9195a369e7 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.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm.test</artifactId> diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java index 6a95f9a2d3..6339831a40 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java @@ -93,7 +93,7 @@ public class MergeToolTest extends ToolTestCase { createMergeConflict(); - String araxisErrorLine = "compare: unrecognized option `-wait' @ error/compare.c/CompareImageCommand/1123."; + String araxisErrorLine = "compare-im6.q16: unrecognized option `-wait' @ error/compare.c/CompareImageCommand/1131."; String[] expectedErrorOutput = { araxisErrorLine, araxisErrorLine, }; runAndCaptureUsingInitRaw(Arrays.asList(expectedErrorOutput), MERGE_TOOL, "--no-prompt"); diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index ac4a20a3ef..fbcab95354 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.1.1.qualifier +Bundle-Version: 7.2.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.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.archive;version="[7.1.1,7.2.0)", - org.eclipse.jgit.awtui;version="[7.1.1,7.2.0)", - org.eclipse.jgit.blame;version="[7.1.1,7.2.0)", - org.eclipse.jgit.diff;version="[7.1.1,7.2.0)", - org.eclipse.jgit.dircache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.gitrepo;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.io;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.server;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.server.s3;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.merge;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.notes;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revplot;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.pack;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http.apache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.resolver;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.sshd;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.archive;version="[7.2.0,7.3.0)", + org.eclipse.jgit.awtui;version="[7.2.0,7.3.0)", + org.eclipse.jgit.blame;version="[7.2.0,7.3.0)", + org.eclipse.jgit.diff;version="[7.2.0,7.3.0)", + org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.gitrepo;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.io;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.server;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.server.s3;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.merge;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.notes;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revplot;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.pack;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http.apache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.resolver;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.sshd;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.0,7.3.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.1.1"; +Export-Package: org.eclipse.jgit.console;version="7.2.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="7.1.1"; + org.eclipse.jgit.pgm;version="7.2.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.1.1"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="7.1.1"; + org.eclipse.jgit.pgm.debug;version="7.2.0"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="7.1.1"; + org.eclipse.jgit.pgm.internal;version="7.2.0"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="7.1.1"; + org.eclipse.jgit.pgm.opt;version="7.2.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 38f4bcbffd..0101464c82 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index a9d5712577..81efa44cc6 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.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm</artifactId> 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 ac73327b24..6eeb24d6b4 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.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.1.1,7.2.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.2.0,7.3.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.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.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.1.1";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.2.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 67c7459b46..30437f25ee 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index b2972b25d5..feec706a25 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.1.1-SNAPSHOT</version> + <version>7.2.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 3699248127..f266ce106a 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.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -23,19 +23,19 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)", org.apache.sshd.core;version="[2.14.0,2.15.0)", org.apache.sshd.server;version="[2.14.0,2.15.0)", org.apache.sshd.server.forward;version="[2.14.0,2.15.0)", - org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.signing.ssh;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit.ssh;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.sshd;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.signing.ssh;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit.ssh;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.sshd;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.rules;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 9a50c8b306..2df07f7ea1 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.1.1-SNAPSHOT</version> + <version>7.2.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 1fb5492ef9..b6b528cec4 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,10 +6,10 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.internal.transport.sshd;version="7.1.1";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.internal.transport.sshd;version="7.2.0";x-internal:=true; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -24,19 +24,19 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.1";x-friends: org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="7.1.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="7.1.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.1.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="7.1.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.signing.ssh;version="7.1.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.transport.sshd;version="7.1.1"; + org.eclipse.jgit.internal.transport.sshd.agent;version="7.2.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="7.2.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.2.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.signing.ssh;version="7.2.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.transport.sshd;version="7.2.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.1.1", + org.eclipse.jgit.transport.sshd.agent;version="7.2.0", sun.security.x509 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.agent;version="[2.14.0,2.15.0)", @@ -91,14 +91,14 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.sftp;version="[2.14.0,2.15.0)", org.apache.sshd.sftp.client;version="[2.14.0,2.15.0)", org.apache.sshd.sftp.common;version="[2.14.0,2.15.0)", - org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.fnmatch;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.fnmatch;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.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 80618201f7..c19e0aa253 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index e1224dfb8d..a002290378 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.1.1-SNAPSHOT</version> + <version>7.2.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 feef17a1f5..9cf812ce3b 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ 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.1.1.qualifier +Bundle-Version: 7.2.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.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit.ssh;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit.ssh;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.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 0873a316e7..e84ac4d574 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.1.1-SNAPSHOT</version> + <version>7.2.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 05ad1a4cef..ed6115b046 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.1.1,7.2.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.1.1" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.2.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.0,7.3.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 883b7e4dd8..4e8da25752 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index eacd219ceb..fdc5ffb8b3 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.1.1-SNAPSHOT</version> + <version>7.2.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 d33d3e1af1..c1aaea93b6 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.1.1.qualifier +Bundle-Version: 7.2.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.1.1,7.2.0)", - org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.archive;version="[7.1.1,7.2.0)", - org.eclipse.jgit.attributes;version="[7.1.1,7.2.0)", - org.eclipse.jgit.awtui;version="[7.1.1,7.2.0)", - org.eclipse.jgit.blame;version="[7.1.1,7.2.0)", - org.eclipse.jgit.diff;version="[7.1.1,7.2.0)", - org.eclipse.jgit.dircache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.events;version="[7.1.1,7.2.0)", - org.eclipse.jgit.fnmatch;version="[7.1.1,7.2.0)", - org.eclipse.jgit.gitrepo;version="[7.1.1,7.2.0)", - org.eclipse.jgit.hooks;version="[7.1.1,7.2.0)", - org.eclipse.jgit.ignore;version="[7.1.1,7.2.0)", - org.eclipse.jgit.ignore.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.diff;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.fsck;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="7.1.1", - org.eclipse.jgit.internal.storage.dfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.io;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.memory;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit.time;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.logging;version="[7.1.1,7.2.0)", - org.eclipse.jgit.merge;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.notes;version="[7.1.1,7.2.0)", - org.eclipse.jgit.patch;version="[7.1.1,7.2.0)", - org.eclipse.jgit.pgm;version="[7.1.1,7.2.0)", - org.eclipse.jgit.pgm.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revplot;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.pack;version="[7.1.1,7.2.0)", - org.eclipse.jgit.submodule;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.resolver;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.sha1;version="[7.1.1,7.2.0)", + org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.archive;version="[7.2.0,7.3.0)", + org.eclipse.jgit.attributes;version="[7.2.0,7.3.0)", + org.eclipse.jgit.awtui;version="[7.2.0,7.3.0)", + org.eclipse.jgit.blame;version="[7.2.0,7.3.0)", + org.eclipse.jgit.diff;version="[7.2.0,7.3.0)", + org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.events;version="[7.2.0,7.3.0)", + org.eclipse.jgit.fnmatch;version="[7.2.0,7.3.0)", + org.eclipse.jgit.gitrepo;version="[7.2.0,7.3.0)", + org.eclipse.jgit.hooks;version="[7.2.0,7.3.0)", + org.eclipse.jgit.ignore;version="[7.2.0,7.3.0)", + org.eclipse.jgit.ignore.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.diff;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.fsck;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="7.2.0", + org.eclipse.jgit.internal.storage.dfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.io;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.memory;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit.time;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.logging;version="[7.2.0,7.3.0)", + org.eclipse.jgit.merge;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.notes;version="[7.2.0,7.3.0)", + org.eclipse.jgit.patch;version="[7.2.0,7.3.0)", + org.eclipse.jgit.pgm;version="[7.2.0,7.3.0)", + org.eclipse.jgit.pgm.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revplot;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.pack;version="[7.2.0,7.3.0)", + org.eclipse.jgit.submodule;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.resolver;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.sha1;version="[7.2.0,7.3.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 c3b80efa4d..c936b09fd7 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.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.test</artifactId> diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 68fd8e302e..423d22b748 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.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.awtui;version="7.1.1" -Import-Package: org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revplot;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)" +Export-Package: org.eclipse.jgit.awtui;version="7.2.0" +Import-Package: org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revplot;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 33c83b488d..12363f802e 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 02bc6fe16c..ada06ed656 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.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ui</artifactId> diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters deleted file mode 100644 index 1408a9d00d..0000000000 --- a/org.eclipse.jgit/.settings/.api_filters +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<component id="org.eclipse.jgit" version="2"> - <resource path="src/org/eclipse/jgit/diff/DiffDriver.java" type="org.eclipse.jgit.diff.DiffDriver"> - <filter id="1109393411"> - <message_arguments> - <message_argument value="6.10.1"/> - <message_argument value="org.eclipse.jgit.diff.DiffDriver"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/diff/DiffFormatter.java" type="org.eclipse.jgit.diff.DiffFormatter"> - <filter id="1142947843"> - <message_arguments> - <message_argument value="6.10.1"/> - <message_argument value="format(EditList, RawText, RawText, DiffDriver)"/> - </message_arguments> - </filter> - <filter id="1142947843"> - <message_arguments> - <message_argument value="6.10.1"/> - <message_argument value="format(FileHeader, RawText, RawText, DiffDriver)"/> - </message_arguments> - </filter> - <filter id="1142947843"> - <message_arguments> - <message_argument value="6.10.1"/> - <message_argument value="writeHunkHeader(int, int, int, int, String)"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants"> - <filter id="1142947843"> - <message_arguments> - <message_argument value="6.10.1"/> - <message_argument value="ATTR_BUILTIN_UNION_MERGE_DRIVER"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/merge/ContentMergeStrategy.java" type="org.eclipse.jgit.merge.ContentMergeStrategy"> - <filter id="1176502275"> - <message_arguments> - <message_argument value="6.10.1"/> - <message_argument value="UNION"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger"> - <filter id="336658481"> - <message_arguments> - <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/> - <message_argument value="attributesNodeProvider"/> - </message_arguments> - </filter> - <filter id="1142947843"> - <message_arguments> - <message_argument value="6.10.1"/> - <message_argument value="attributesNodeProvider"/> - </message_arguments> - </filter> - <filter id="1142947843"> - <message_arguments> - <message_argument value="6.10.1"/> - <message_argument value="setAttributesNodeProvider(AttributesNodeProvider)"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/transport/UploadPack.java" type="org.eclipse.jgit.transport.UploadPack$RequestPolicy"> - <filter id="1176502275"> - <message_arguments> - <message_argument value="6.10.1"/> - <message_argument value="implies(UploadPack.RequestPolicy)"/> - </message_arguments> - </filter> - </resource> -</component> diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 3c864fdc41..659ad8549f 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.1.1.qualifier +Bundle-Version: 7.2.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.1.1", - org.eclipse.jgit.api;version="7.1.1"; +Export-Package: org.eclipse.jgit.annotations;version="7.2.0", + org.eclipse.jgit.api;version="7.2.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.1.1", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="7.1.1"; + org.eclipse.jgit.api.errors;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="7.1.1"; + org.eclipse.jgit.attributes;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="7.1.1"; + org.eclipse.jgit.blame;version="7.2.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.1.1"; + org.eclipse.jgit.diff;version="7.2.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.1.1", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="7.1.1"; + org.eclipse.jgit.dircache;version="7.2.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.1.1"; + org.eclipse.jgit.errors;version="7.2.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.1.1"; + org.eclipse.jgit.events;version="7.2.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="7.1.1", - org.eclipse.jgit.gitrepo;version="7.1.1"; + org.eclipse.jgit.fnmatch;version="7.2.0", + org.eclipse.jgit.gitrepo;version="7.2.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.1.1";x-internal:=true, - org.eclipse.jgit.hooks;version="7.1.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="7.1.1", - org.eclipse.jgit.ignore.internal;version="7.1.1"; + org.eclipse.jgit.gitrepo.internal;version="7.2.0";x-internal:=true, + org.eclipse.jgit.hooks;version="7.2.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="7.2.0", + org.eclipse.jgit.ignore.internal;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="7.1.1"; + org.eclipse.jgit.internal;version="7.2.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="7.1.1"; + org.eclipse.jgit.internal.diff;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="7.1.1"; + org.eclipse.jgit.internal.diffmergetool;version="7.2.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.1.1"; + org.eclipse.jgit.internal.fsck;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="7.1.1"; + org.eclipse.jgit.internal.revwalk;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="7.1.1"; + org.eclipse.jgit.internal.storage.commitgraph;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="7.1.1"; + org.eclipse.jgit.internal.storage.dfs;version="7.2.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.1.1"; + org.eclipse.jgit.internal.storage.file;version="7.2.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.1.1", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="7.1.1"; + org.eclipse.jgit.internal.storage.io;version="7.2.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="7.1.1"; + org.eclipse.jgit.internal.storage.memory;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.pack;version="7.1.1"; + org.eclipse.jgit.internal.storage.pack;version="7.2.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="7.1.1"; + org.eclipse.jgit.internal.storage.reftable;version="7.2.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.1.1";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="7.1.1"; + org.eclipse.jgit.internal.submodule;version="7.2.0";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="7.1.1"; + org.eclipse.jgit.internal.transport.http;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="7.1.1"; + org.eclipse.jgit.internal.transport.parser;version="7.2.0"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="7.1.1"; + org.eclipse.jgit.internal.transport.ssh;version="7.2.0"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.internal.util;version="7.1.1"; + org.eclipse.jgit.internal.util;version="7.2.0"; x-friends:=" org.eclipse.jgit.junit", - org.eclipse.jgit.lib;version="7.1.1"; + org.eclipse.jgit.lib;version="7.2.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.1.1", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="7.1.1"; + org.eclipse.jgit.lib.internal;version="7.2.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="7.1.1", - org.eclipse.jgit.merge;version="7.1.1"; + org.eclipse.jgit.logging;version="7.2.0", + org.eclipse.jgit.merge;version="7.2.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.1.1", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="7.1.1", - org.eclipse.jgit.notes;version="7.1.1"; + org.eclipse.jgit.nls;version="7.2.0", + org.eclipse.jgit.notes;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="7.1.1"; + org.eclipse.jgit.patch;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="7.1.1"; + org.eclipse.jgit.revplot;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="7.1.1"; + org.eclipse.jgit.revwalk;version="7.2.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.1.1"; + org.eclipse.jgit.revwalk.filter;version="7.2.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="7.1.1"; + org.eclipse.jgit.storage.file;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="7.1.1"; + org.eclipse.jgit.storage.pack;version="7.2.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="7.1.1"; + org.eclipse.jgit.submodule;version="7.2.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.1.1"; + org.eclipse.jgit.transport;version="7.2.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.1.1", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="7.1.1"; + org.eclipse.jgit.transport.http;version="7.2.0"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="7.1.1"; + org.eclipse.jgit.transport.resolver;version="7.2.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="7.1.1"; + org.eclipse.jgit.treewalk;version="7.2.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.1.1"; + org.eclipse.jgit.treewalk.filter;version="7.2.0"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="7.1.1"; + org.eclipse.jgit.util;version="7.2.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.1.1", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="7.1.1"; + org.eclipse.jgit.util.io;version="7.2.0"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="7.1.1", - org.eclipse.jgit.util.time;version="7.1.1" + org.eclipse.jgit.util.sha1;version="7.2.0", + org.eclipse.jgit.util.time;version="7.2.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 df2e804924..0f9ec1fb22 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.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 1805206ec1..df7ae83647 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.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit</artifactId> diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java index 6375a60383..cbac3f90b7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java @@ -1334,7 +1334,7 @@ public class DiffFormatter implements AutoCloseable { continue; } if (matchesAny(diffDriver.getMatchPatterns(), line)) { - String funcName = line.replaceAll("^[ \\t]+", ""); + String funcName = line.replaceAll("^[ \\t]+", ""); //$NON-NLS-1$//$NON-NLS-2$ return funcName.substring(0, Math.min(funcName.length(), 80)).trim(); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java index aaac2a72e0..f66b3f65de 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java @@ -38,12 +38,12 @@ import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; -import org.eclipse.jgit.lib.CoreConfig.EolStreamType; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.MutableObjectId; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.CoreConfig.EolStreamType; import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.treewalk.filter.PathFilter; import org.eclipse.jgit.treewalk.filter.TreeFilter; @@ -1591,6 +1591,9 @@ public class TreeWalk implements AutoCloseable, AttributesProvider { String filterCommand = filterCommandsByNameDotType.get(key); if (filterCommand != null) return filterCommand; + if (config == null) { + return null; + } filterCommand = config.getString(ConfigConstants.CONFIG_FILTER_SECTION, filterDriverName, filterCommandType); boolean useBuiltin = config.getBoolean( @@ -18,7 +18,7 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> <packaging>pom</packaging> - <version>7.1.1-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> <name>JGit - Parent</name> <url>${jgit-url}</url> @@ -118,7 +118,7 @@ <project.build.outputTimestamp>${commit.time.iso}</project.build.outputTimestamp> - <jgit-last-release-version>7.0.0.202409031743-r</jgit-last-release-version> + <jgit-last-release-version>7.1.0.202411261347-r</jgit-last-release-version> <ant-version>1.10.15</ant-version> <apache-sshd-version>2.14.0</apache-sshd-version> <jsch-version>0.1.55</jsch-version> |