.apache-commons-compress.metadata

@@ -1 +1 @@
-df2eaf0fe313ac68f0ace6e460fa56633051472b SOURCES/commons-compress-1.19-src.tar.gz
+9216b24e69c391983dab2af1496b97e449208422 commons-compress-1.20-src.tar.gz

.gitignore

@@ -1 +1,2 @@
-SOURCES/commons-compress-1.19-src.tar.gz
+SOURCES/commons-compress-1.20-src.tar.gz
+/commons-compress-1.20-src.tar.gz

0003-Remove-Pack200-compressor.patch

@@ -0,0 +1,54 @@
+From 9937297a90b43a5e1238932eb8a07c44303056ed Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Fri, 6 Aug 2021 13:42:40 +0200
+Subject: [PATCH] Remove Pack200 compressor
+
+---
+ .../compress/compressors/CompressorStreamFactory.java  | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
+index eee7c31..de7da23 100644
+--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
++++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
+@@ -45,8 +45,6 @@ import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorOutputStre
+ import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream;
+ import org.apache.commons.compress.compressors.lzma.LZMACompressorOutputStream;
+ import org.apache.commons.compress.compressors.lzma.LZMAUtils;
+-import org.apache.commons.compress.compressors.pack200.Pack200CompressorInputStream;
+-import org.apache.commons.compress.compressors.pack200.Pack200CompressorOutputStream;
+ import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream;
+ import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorOutputStream;
+ import org.apache.commons.compress.compressors.snappy.SnappyCompressorInputStream;
+@@ -478,10 +476,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+             return GZIP;
+         }
+ 
+-        if (Pack200CompressorInputStream.matches(signature, signatureLength)) {
+-            return PACK200;
+-        }
+-
+         if (FramedSnappyCompressorInputStream.matches(signature, signatureLength)) {
+             return SNAPPY_FRAMED;
+         }
+@@ -592,7 +586,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+             }
+ 
+             if (PACK200.equalsIgnoreCase(name)) {
+-                return new Pack200CompressorInputStream(in);
++                throw new CompressorException("Pack200 compression is not available in this build.");
+             }
+ 
+             if (SNAPPY_RAW.equalsIgnoreCase(name)) {
+@@ -673,7 +667,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+             }
+ 
+             if (PACK200.equalsIgnoreCase(name)) {
+-                return new Pack200CompressorOutputStream(out);
++                throw new CompressorException("Pack200 compression is not available in this build.");
+             }
+ 
+             if (LZMA.equalsIgnoreCase(name)) {
+-- 
+2.31.1
+

apache-commons-compress.spec

@@ -1,12 +1,15 @@
-Name:           apache-commons-compress
-Version:        1.19
-Release:        2%{?dist}
+%global base_name       compress
+%global short_name      commons-%{base_name}
+
+Name:           apache-%{short_name}
+Version:        1.20
+Release:        3%{?dist}
 Summary:        Java API for working with compressed files and archivers
 License:        ASL 2.0
 URL:            http://commons.apache.org/proper/commons-compress/
 BuildArch:      noarch
 
-Source0:        http://archive.apache.org/dist/commons/compress/source/commons-compress-%{version}-src.tar.gz
+Source0:        http://archive.apache.org/dist/commons/compress/source/%{short_name}-%{version}-src.tar.gz
 
 Patch0:         0001-Remove-Brotli-compressor.patch
 Patch1:         0002-Remove-ZSTD-compressor.patch
@@ -18,7 +21,7 @@ BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
 BuildRequires:  mvn(org.mockito:mockito-core)
-BuildRequires:  mvn(org.osgi:org.osgi.core)
+BuildRequires:  mvn(org.osgi:osgi.core)
 BuildRequires:  mvn(org.tukaani:xz)
 
 %description
@@ -34,7 +37,7 @@ Summary:        API documentation for %{name}
 This package provides %{summary}.
 
 %prep
-%setup -q -n commons-compress-%{version}-src
+%setup -q -n %{short_name}-%{version}-src
 
 # Unavailable Google Brotli library (org.brotli.dec)
 %patch0 -p1
@@ -57,17 +60,20 @@ rm src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCas
 %pom_remove_dep :slf4j-api::test
 rm src/test/java/org/apache/commons/compress/OsgiITest.java
 
+# use osgi-core instead of felix-osgi-core
+%pom_change_dep :org.osgi.core org.osgi:osgi.core
+
 # Remove test that requires powermock
 %pom_remove_dep org.powermock:
 %pom_add_dep org.mockito:mockito-core::test
 rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java
 
+# Generate Java 8 level bytecode when built on Java 11
+%pom_xpath_replace "pom:maven.compiler.release" "<maven.compiler.release>8</maven.compiler.release>"
+
 %build
-%mvn_file  : commons-compress %{name}
+%mvn_file  : %{short_name} %{name}
 %mvn_alias : commons:
-%if 0%{?rhel} && 0%{?rhel} <= 7
-export LC_ALL=en_US.UTF-8
-%endif
 %mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.compress
 
 %install
@@ -80,18 +86,30 @@ export LC_ALL=en_US.UTF-8
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.19-2
-- Mass rebuild for javapackages-tools 201902
+* Thu Jul 16 2020 Mat Booth <mat.booth@redhat.com> - 1.20-3
+- Ensure Java 8 level bytecode when built on Java 11
 
-* Mon Sep 02 2019 Marian Koncek <mkoncek@redhat.com> - 1.19-1
-- Update to upstream version 1.19
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.20-2
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
 
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.18-6
-- Mass rebuild for javapackages-tools 201901
+* Mon Mar 02 2020 Fabio Valentini <decathorpe@gmail.com> - 1.20-1
+- Update to version 1.20.
 
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.18-5
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Oct 04 2019 Fabio Valentini <decathorpe@gmail.com> - 1.19-1
+- Update to version 1.19.
+
+* Wed Sep 18 2019 Fabio Valentini <decathorpe@gmail.com> - 1.18-7
+- Migrate from the obsolete felix-osgi-core to osgi-core.
+
+* Wed Aug 14 2019 Fabio Valentini <decathorpe@gmail.com> - 1.18-6
 - Remove build-dependency on powermock
 
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Thu Feb 14 2019 Mat Booth <mat.booth@redhat.com> - 1.18-4
 - Rebuild to regenerate OSGi metadata
 
@@ -103,7 +121,7 @@ export LC_ALL=en_US.UTF-8
 
 * Fri Oct 05 2018 Marian Koncek <mkoncek@redhat.com> - 1.18-1
 - Update to upstream version 1.18
-- Resolves: CVE-2018-11771
+- CVE-2018-11771
 
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

gating.yaml

@@ -0,0 +1,8 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_contexts:
+  - osci_compose_gate
+rules:
+  # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test
+  - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}

sources

@@ -0,0 +1 @@
+SHA512 (commons-compress-1.20-src.tar.gz) = 1794bae69e00339d9e4d35b3276543ff6f9a0f1614ec9bd7c4ec8ff1bc86d08cd48e9dc3ec712b969cf8ccd61ef6054d0c6203d7cba0c28b22e6a3ecccd0c43e