Update org.apache.commons.compress from 1.19 to 1.20
CQ: 21771
Change-Id: Ia5334dd589d3b887592d0aab1c00524b92b6fec9
diff --git a/apache/org.apache.commons.compress_1.19.0/osgi.bnd b/apache/org.apache.commons.compress_1.19.0/osgi.bnd
deleted file mode 100644
index 93464e4..0000000
--- a/apache/org.apache.commons.compress_1.19.0/osgi.bnd
+++ /dev/null
@@ -1,15 +0,0 @@
-package-version=${version;===;${Bundle-Version}}
-zstd-jni-version-range=${range;[===,+);1.4.0-1}zstd-jni-version=${version;===;1.4.0-1}
-dec-version-range=${range;[===,+);0.1.2}dec-version=${version;===;0.1.2}
-xz-version-range=${range;[===,+);1.8}xz-version=${version;===;1.8}
-org.osgi.core-version-range=${range;[===,+);6.0.0}org.osgi.core-version=${version;===;6.0.0}
-
-Export-Package: \
- !about.html,!about_files, \
- *.internal.*;x-internal:=true;version="${package-version}", \
- *.implementation.*;x-internal:=true;version="${package-version}", \
- *.impl.*;x-internal:=true;version="${package-version}", \
- *;version="${package-version}"
-
-Import-Package: \
- *;resolution:=optional
diff --git a/apache/org.apache.commons.compress_1.19.0/.project b/apache/org.apache.commons.compress_1.20.0/.project
similarity index 91%
rename from apache/org.apache.commons.compress_1.19.0/.project
rename to apache/org.apache.commons.compress_1.20.0/.project
index 1326b1e..c78e9ab 100644
--- a/apache/org.apache.commons.compress_1.19.0/.project
+++ b/apache/org.apache.commons.compress_1.20.0/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.apache.commons.compress_1.19.0</name>
+ <name>org.apache.commons.compress_1.20.0</name>
<comment></comment>
<projects>
</projects>
diff --git a/apache/org.apache.commons.compress_1.20.0/osgi.bnd b/apache/org.apache.commons.compress_1.20.0/osgi.bnd
new file mode 100644
index 0000000..560e3e1
--- /dev/null
+++ b/apache/org.apache.commons.compress_1.20.0/osgi.bnd
@@ -0,0 +1,23 @@
+package-version=${version;===;${Bundle-Version}}
+zstd-jni-version-range=${range;[===,+);1.4.0}
+zstd-jni-version=${version;===;1.4.0}
+dec-version-range=${range;[===,+);0.1.2}
+dec-version=${version;===;0.1.2}
+xz-version-range=${range;[===,+);1.8}
+xz-version=${version;===;1.8}
+org.osgi.core-version-range=${range;[===,+);6.0.0}
+org.osgi.core-version=${version;===;6.0.0}
+
+Export-Package: \
+ !about.html,!about_files, \
+ *.internal.*;x-internal:=true;version="${package-version}", \
+ *.implementation.*;x-internal:=true;version="${package-version}", \
+ *.impl.*;x-internal:=true;version="${package-version}", \
+ *;version="${package-version}"
+
+Import-Package: \
+ com.github.luben.zstd.*;version="${zstd-jni-version-range}";resolution:=optional, \
+ org.brotli.dec.*;version="${dec-version-range}";resolution:=optional, \
+ org.tukaani.xz.*;version="${xz-version-range}";resolution:=optional, \
+ org.osgi.*;version="${org.osgi.core-version-range}";resolution:=optional, \
+ *;resolution:=optional
diff --git a/apache/org.apache.commons.compress_1.19.0/pom.xml b/apache/org.apache.commons.compress_1.20.0/pom.xml
similarity index 91%
rename from apache/org.apache.commons.compress_1.19.0/pom.xml
rename to apache/org.apache.commons.compress_1.20.0/pom.xml
index 3abd1f9..c5e0525 100644
--- a/apache/org.apache.commons.compress_1.19.0/pom.xml
+++ b/apache/org.apache.commons.compress_1.20.0/pom.xml
@@ -8,14 +8,14 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.commons.compress</artifactId>
- <version>1.19.0-SNAPSHOT</version>
+ <version>1.20.0-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>Apache Commons Compress</name>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.19</version>
+ <version>1.20</version>
</dependency>
</dependencies>
</project>
diff --git a/apache/org.apache.commons.compress_1.19.0/src/eclipse/ip_log.xml b/apache/org.apache.commons.compress_1.20.0/src/eclipse/ip_log.xml
similarity index 69%
rename from apache/org.apache.commons.compress_1.19.0/src/eclipse/ip_log.xml
rename to apache/org.apache.commons.compress_1.20.0/src/eclipse/ip_log.xml
index 61bab00..6932abe 100644
--- a/apache/org.apache.commons.compress_1.19.0/src/eclipse/ip_log.xml
+++ b/apache/org.apache.commons.compress_1.20.0/src/eclipse/ip_log.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.apache.commons.compress" version="1.19.0" status="done">
+ <project id="org.apache.commons.compress" version="1.20.0" status="done">
<info>
<name>Apache Commons Compress</name>
<repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
@@ -12,12 +12,13 @@
<company>SAP SE</company>
</contact>
<legal>
- <ipzilla bug_id="21349"/>
+ <ipzilla bug_id="21771"/>
+ <clearlydefined url="https://clearlydefined.io/definitions/maven/mavencentral/org.apache.commons/commons-compress/1.20"/>
<license>
<name>Apache License, 2.0</name>
<reference>http://www.apache.org/licenses/LICENSE-2.0.txt</reference>
</license>
- <package>commons-compress-1.19.jar</package>
+ <package>commons-compress-1.20.jar</package>
</legal>
</project>
</ip_log>
\ No newline at end of file
diff --git a/apache/org.apache.commons.compress_1.19.0/src/main/resources/OSGI-INF/l10n/bundle.properties b/apache/org.apache.commons.compress_1.20.0/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from apache/org.apache.commons.compress_1.19.0/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to apache/org.apache.commons.compress_1.20.0/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/apache/org.apache.commons.compress_1.19.0/src/main/resources/about.html b/apache/org.apache.commons.compress_1.20.0/src/main/resources/about.html
similarity index 100%
rename from apache/org.apache.commons.compress_1.19.0/src/main/resources/about.html
rename to apache/org.apache.commons.compress_1.20.0/src/main/resources/about.html
diff --git a/apache/org.apache.commons.compress_1.19.0/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt b/apache/org.apache.commons.compress_1.20.0/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt
similarity index 100%
rename from apache/org.apache.commons.compress_1.19.0/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt
rename to apache/org.apache.commons.compress_1.20.0/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt
diff --git a/apache/pom.xml b/apache/pom.xml
index b52649a..6012f2c 100644
--- a/apache/pom.xml
+++ b/apache/pom.xml
@@ -18,7 +18,7 @@
<module>org.apache.commons.cli_1.4.0</module>
<module>org.apache.commons.codec_1.14.0</module>
<module>org.apache.commons.collections4_4.4.0</module>
- <module>org.apache.commons.compress_1.19.0</module>
+ <module>org.apache.commons.compress_1.20.0</module>
<module>org.apache.commons.csv_1.8.0</module>
<module>org.apache.commons.fileupload_1.3.2</module>
<module>org.apache.commons.io_2.8.0</module>
diff --git a/releng/aggregationfeature/feature.xml b/releng/aggregationfeature/feature.xml
index 82f96e2..8a14906 100644
--- a/releng/aggregationfeature/feature.xml
+++ b/releng/aggregationfeature/feature.xml
@@ -109,7 +109,7 @@
<plugin id="org.apache.commons.cli" version="1.4.0.qualifier"/>
- <plugin id="org.apache.commons.compress" version="1.19.0.qualifier"/>
+ <plugin id="org.apache.commons.compress" version="1.20.0.qualifier"/>
<plugin id="org.apache.commons.collections4" version="4.4.0.qualifier"/>
<plugin id="org.apache.felix.gogo.command" version="1.1.2.qualifier"/>
