Update org.apache.commons:commons-compress to 1.23.0

and consume it directly from Maven Central.

Its BundleSymbolicName changes to "org.apache.commons.commons-compress"
which is defined upstream.

Change-Id: I691f5f49491dd2c9ba577ebe0c6f7cdd462c047a
This commit is contained in:
Matthias Sohn 2023-05-01 14:58:23 +02:00
parent ee2143f744
commit 6890b8ffa8
15 changed files with 129 additions and 37 deletions

View File

@ -148,8 +148,8 @@ maven_jar(
maven_jar(
name = "commons-compress",
artifact = "org.apache.commons:commons-compress:1.22",
sha1 = "691a8b4e6cf4248c3bc72c8b719337d5cb7359fa",
artifact = "org.apache.commons:commons-compress:1.23.0",
sha1 = "4af2060ea9b0c8b74f1854c6cafe4d43cfc161fc",
)
maven_jar(

View File

@ -141,10 +141,10 @@
<bundle id="org.apache.commons.codec.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.commons.compress">
<bundle id="org.apache.commons.commons-compress">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.commons.compress.source">
<bundle id="org.apache.commons.commons-compress.source">
<category name="JGit-dependency-bundles"/>
</bundle>
<bundle id="org.apache.commons.logging">

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.17" sequenceNumber="1682933066">
<target name="jgit-4.17" sequenceNumber="1682945515">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
@ -24,8 +24,6 @@
<unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.compress" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.compress.source" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/>
@ -154,5 +152,15 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache">
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.23.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
</target>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.18" sequenceNumber="1682933066">
<target name="jgit-4.18" sequenceNumber="1682945515">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
@ -24,8 +24,6 @@
<unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.compress" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.compress.source" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/>
@ -154,5 +152,15 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache">
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.23.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
</target>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.19-staging" sequenceNumber="1682933066">
<target name="jgit-4.19-staging" sequenceNumber="1682945514">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
@ -24,8 +24,6 @@
<unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.compress" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.compress.source" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/>
@ -154,5 +152,15 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache">
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.23.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
</target>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.20" sequenceNumber="1682933066">
<target name="jgit-4.20" sequenceNumber="1682945514">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
@ -24,8 +24,6 @@
<unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.compress" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.compress.source" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/>
@ -154,5 +152,15 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache">
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.23.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
</target>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.21" sequenceNumber="1682933066">
<target name="jgit-4.21" sequenceNumber="1682945515">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
@ -24,8 +24,6 @@
<unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.compress" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.compress.source" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/>
@ -154,5 +152,15 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache">
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.23.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
</target>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.22" sequenceNumber="1682933065">
<target name="jgit-4.22" sequenceNumber="1682945514">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
@ -24,8 +24,6 @@
<unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.compress" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.compress.source" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/>
@ -154,5 +152,15 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache">
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.23.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
</target>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.23" sequenceNumber="1682933065">
<target name="jgit-4.23" sequenceNumber="1682945514">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
@ -24,8 +24,6 @@
<unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.compress" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.compress.source" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/>
@ -154,5 +152,15 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache">
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.23.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
</target>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.24" sequenceNumber="1682933065">
<target name="jgit-4.24" sequenceNumber="1682945514">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
@ -24,8 +24,6 @@
<unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.compress" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.compress.source" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/>
@ -154,5 +152,15 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache">
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.23.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
</target>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.25" sequenceNumber="1682933065">
<target name="jgit-4.25" sequenceNumber="1682945514">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
@ -24,8 +24,6 @@
<unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.compress" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.compress.source" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/>
@ -154,5 +152,15 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache">
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.23.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
</target>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.26" sequenceNumber="1682933065">
<target name="jgit-4.26" sequenceNumber="1682945514">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
@ -24,8 +24,6 @@
<unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.codec.source" version="1.14.0.v20221112-0806"/>
<unit id="org.apache.commons.compress" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.compress.source" version="1.22.0.v20221207-1049"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/>
@ -154,5 +152,15 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache">
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.23.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
</target>

View File

@ -1,5 +1,19 @@
target "dependencies"
maven apache
scope = compile
dependencyDepth = none
missingManifest = error
includeSources
{
dependency {
groupId = "org.apache.commons"
artifactId = "commons-compress"
version = "1.23.0"
}
}
maven bouncycastle
scope = compile
dependencyDepth = none

View File

@ -22,8 +22,6 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202303020146
org.apache.ant.source [1.10.12.v20211102-1452,1.10.12.v20211102-1452]
org.apache.commons.codec [1.14.0.v20221112-0806,1.14.0.v20221112-0806]
org.apache.commons.codec.source [1.14.0.v20221112-0806,1.14.0.v20221112-0806]
org.apache.commons.compress [1.22.0.v20221207-1049,1.22.0.v20221207-1049]
org.apache.commons.compress.source [1.22.0.v20221207-1049,1.22.0.v20221207-1049]
org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
org.apache.httpcomponents.httpclient [4.5.14.v20221207-1049,4.5.14.v20221207-1049]

View File

@ -159,7 +159,7 @@
<junit-version>4.13.2</junit-version>
<test-fork-count>1C</test-fork-count>
<args4j-version>2.33</args4j-version>
<commons-compress-version>1.22</commons-compress-version>
<commons-compress-version>1.23.0</commons-compress-version>
<osgi-core-version>6.0.0</osgi-core-version>
<servlet-api-version>4.0.4</servlet-api-version>
<jetty-version>10.0.15</jetty-version>