diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2025-03-04 15:14:53 +0100 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2025-03-04 15:14:53 +0100 |
commit | 2c90335a9d70d1a7b175b592e3a6582431e827f2 (patch) | |
tree | 4654d0bfae927e0ab87912b22ed6b4e600cdbef3 /org.eclipse.jgit.archive | |
parent | 026d46de13eb2321c18045469f27b065ba107ff5 (diff) | |
parent | 2a3e1191ea8062038a3d11de99d1549678c35d61 (diff) | |
download | jgit-next.tar.gz jgit-next.zip |
Merge branch 'master' into nextnext
* master: (497 commits)
Prepare 7.3.0-SNAPSHOT builds
Prepare 7.2.1-SNAPSHOT builds
JGit v7.2.0.202503040940-r
JGit v7.2.0.202503040805-r
CacheRegion: fix non translatable text warnings
Ensure access to autoRefresh is thread-safe
FileReftableStack: use FileSnapshot to detect modification
FileReftableDatabase: consider ref updates by another process
BlameRegionMerger: report invalid regions with checked exception.
Prepare 7.2.0-SNAPSHOT builds
[ssh known_hosts] Handle unknown keys better
[releng] Remove unused target platform definitions
JGit v7.2.0.202502261823-rc1
[ssh known_hosts] Handle host certificates
[ssh known_hosts] Improve updating modified keys
[ssh known_hosts] Add tests and fix problems
[ssh, releng] Remove net.i2p.crypto.eddsa
AddCommand: Use parenthesis to make the operator precedence explicit
AddCommand: implement --all/--no-all
Do not load bitmap indexes during directory scans
...
Change-Id: I619c89071f5f7a05bcd0218840f7f47bd19b779d
Diffstat (limited to 'org.eclipse.jgit.archive')
-rw-r--r-- | org.eclipse.jgit.archive/BUILD | 1 | ||||
-rw-r--r-- | org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 25 | ||||
-rw-r--r-- | org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF | 4 | ||||
-rw-r--r-- | org.eclipse.jgit.archive/pom.xml | 7 |
4 files changed, 22 insertions, 15 deletions
diff --git a/org.eclipse.jgit.archive/BUILD b/org.eclipse.jgit.archive/BUILD index 3d7dbd21f1..d4f53405d7 100644 --- a/org.eclipse.jgit.archive/BUILD +++ b/org.eclipse.jgit.archive/BUILD @@ -12,6 +12,7 @@ java_library( resources = glob(["resources/**"]), deps = [ "//lib:commons-compress", + "//lib:commons-lang3", # We want these deps to be provided_deps "//org.eclipse.jgit:jgit", ], diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index e1a3671819..fdfc635629 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -13,17 +13,18 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", - org.osgi.framework;version="[1.3.0,2.0.0)" + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.nls;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", + org.osgi.framework;version="[1.3.0,2.0.0)", + org.tukaani.xz Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="7.0.0"; - uses:="org.eclipse.jgit.lib, +Export-Package: org.eclipse.jgit.archive;version="7.3.0"; + uses:="org.apache.commons.compress.archivers, + org.osgi.framework, org.eclipse.jgit.api, - org.apache.commons.compress.archivers, - org.osgi.framework", - org.eclipse.jgit.archive.internal;version="7.0.0";x-internal:=true + org.eclipse.jgit.lib", + org.eclipse.jgit.archive.internal;version="7.3.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 322f52f9f4..716e8d0917 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 054aa59429..3935dfaca0 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.3.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.archive</artifactId> @@ -41,6 +41,11 @@ </dependency> <dependency> + <groupId>org.tukaani</groupId> + <artifactId>xz</artifactId> + </dependency> + + <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> <version>${project.version}</version> |