Update to upstream version 1.25.0

.gitignore

@@ -25,3 +25,4 @@
 /commons-compress-1.19-src.tar.gz
 /commons-compress-1.20-src.tar.gz
 /commons-compress-1.21-src.tar.gz
+/commons-compress-1.25.0-src.tar.gz

0002-Remove-ZSTD-compressor.patch

@@ -8,10 +8,10 @@ Subject: [PATCH 2/3] Remove ZSTD compressor
  1 file changed, 2 insertions(+), 12 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 0f1394f..eee7c31 100644
+index 95b6e45..16bc88e 100644
 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
 +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
-@@ -54,9 +54,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
+@@ -53,9 +53,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
  import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
  import org.apache.commons.compress.compressors.xz.XZUtils;
  import org.apache.commons.compress.compressors.z.ZCompressorInputStream;
@@ -19,20 +19,20 @@ index 0f1394f..eee7c31 100644
 -import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
 -import org.apache.commons.compress.compressors.zstandard.ZstdUtils;
  import org.apache.commons.compress.utils.IOUtils;
- import org.apache.commons.compress.utils.Lists;
- import org.apache.commons.compress.utils.ServiceLoaderIterator;
-@@ -509,10 +506,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+ import org.apache.commons.compress.utils.Sets;
+ 
+@@ -297,10 +294,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              return LZ4_FRAMED;
          }
  
--        if (ZstdUtils.matches(signature, signatureLength)) {
+-        if (compressorNames.contains(ZSTANDARD) && ZstdUtils.matches(signature, signatureLength)) {
 -            return ZSTANDARD;
 -        }
 -
          throw new CompressorException("No Compressor found for the stream signature.");
      }
-     /**
-@@ -588,10 +581,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+ 
+@@ -615,10 +608,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              }
  
              if (ZSTANDARD.equalsIgnoreCase(name)) {
@@ -44,7 +44,7 @@ index 0f1394f..eee7c31 100644
              }
  
              if (LZMA.equalsIgnoreCase(name)) {
-@@ -707,7 +697,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+@@ -734,7 +724,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              }
  
              if (ZSTANDARD.equalsIgnoreCase(name)) {
@@ -54,5 +54,5 @@ index 0f1394f..eee7c31 100644
          } catch (final IOException e) {
              throw new CompressorException("Could not create CompressorOutputStream", e);
 -- 
-2.20.1
+2.43.0
 

0003-Remove-Pack200-compressor.patch

@@ -1,6 +1,6 @@
-From 9937297a90b43a5e1238932eb8a07c44303056ed Mon Sep 17 00:00:00 2001
+From 2db4e6319326e584051ebefd565675356ab0a3cc Mon Sep 17 00:00:00 2001
 From: Marian Koncek <mkoncek@redhat.com>
-Date: Fri, 6 Aug 2021 13:42:40 +0200
+Date: Fri, 8 Dec 2023 14:18:18 +0100
 Subject: [PATCH] Remove Pack200 compressor
 
 ---
@@ -8,10 +8,10 @@ Subject: [PATCH] Remove Pack200 compressor
  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
+index 16bc88e..f3c7f3f 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
+@@ -44,8 +44,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;
@@ -20,18 +20,18 @@ index eee7c31..de7da23 100644
  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 {
+@@ -265,10 +263,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              return GZIP;
          }
  
--        if (Pack200CompressorInputStream.matches(signature, signatureLength)) {
+-        if (compressorNames.contains(PACK200) && Pack200CompressorInputStream.matches(signature, signatureLength)) {
 -            return PACK200;
 -        }
 -
-         if (FramedSnappyCompressorInputStream.matches(signature, signatureLength)) {
+         if (compressorNames.contains(SNAPPY_FRAMED) &&
+                 FramedSnappyCompressorInputStream.matches(signature, signatureLength)) {
              return SNAPPY_FRAMED;
-         }
-@@ -592,7 +586,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+@@ -619,7 +613,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              }
  
              if (PACK200.equalsIgnoreCase(name)) {
@@ -40,7 +40,7 @@ index eee7c31..de7da23 100644
              }
  
              if (SNAPPY_RAW.equalsIgnoreCase(name)) {
-@@ -673,7 +667,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+@@ -700,7 +694,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              }
  
              if (PACK200.equalsIgnoreCase(name)) {
@@ -50,5 +50,5 @@ index eee7c31..de7da23 100644
  
              if (LZMA.equalsIgnoreCase(name)) {
 -- 
-2.31.1
+2.43.0
 

apache-commons-compress.spec

@@ -1,8 +1,8 @@
 %bcond_with bootstrap
 
 Name:           apache-commons-compress
-Version:        1.21
-Release:        7%{?dist}
+Version:        1.25.0
+Release:        1%{?dist}
 Summary:        Java API for working with compressed files and archivers
 License:        Apache-2.0
 URL:            https://commons.apache.org/proper/commons-compress/
@@ -11,21 +11,19 @@ ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://archive.apache.org/dist/commons/compress/source/commons-compress-%{version}-src.tar.gz
 
-Patch0:         0001-Remove-Brotli-compressor.patch
-Patch1:         0002-Remove-ZSTD-compressor.patch
-Patch2:         0003-Remove-Pack200-compressor.patch
+Patch1:         0001-Remove-Brotli-compressor.patch
+Patch2:         0002-Remove-ZSTD-compressor.patch
+Patch3:         0003-Remove-Pack200-compressor.patch
 
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
 BuildRequires:  maven-local
-BuildRequires:  mvn(junit:junit)
 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.hamcrest:hamcrest)
-BuildRequires:  mvn(org.mockito:mockito-core)
 BuildRequires:  mvn(org.osgi:org.osgi.core)
+BuildRequires:  mvn(org.ow2.asm:asm)
 BuildRequires:  mvn(org.tukaani:xz)
 %endif
 
@@ -45,23 +43,20 @@ This package provides %{summary}.
 %setup -q -n commons-compress-%{version}-src
 
 # Unavailable Google Brotli library (org.brotli.dec)
-%patch0 -p1
+%patch 1 -p1
 %pom_remove_dep org.brotli:dec
 rm -r src/{main,test}/java/org/apache/commons/compress/compressors/brotli
 
 # Unavailable ZSTD JNI library
-%patch1 -p1
+%patch 2 -p1
 %pom_remove_dep :zstd-jni
 rm -r src/{main,test}/java/org/apache/commons/compress/compressors/zstandard
-rm src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java
 
 # Remove support for pack200 which depends on ancient asm:asm:3.2
-%patch2 -p1
-%pom_remove_dep asm:asm
+%patch 3 -p1
 rm -r src/{main,test}/java/org/apache/commons/compress/harmony
 rm -r src/main/java/org/apache/commons/compress/compressors/pack200
 rm src/main/java/org/apache/commons/compress/java/util/jar/Pack200.java
-rm src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java
 rm -r src/test/java/org/apache/commons/compress/compressors/pack200
 rm src/test/java/org/apache/commons/compress/java/util/jar/Pack200Test.java
 
@@ -92,6 +87,9 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Fri Dec 08 2023 Marian Koncek <mkoncek@redhat.com> - 1.25.0-1
+- Update to upstream version 1.25.0
+
 * Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.21-7
 - Convert License tag to SPDX format
 

sources

@@ -1 +1 @@
-SHA512 (commons-compress-1.21-src.tar.gz) = 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1
+SHA512 (commons-compress-1.25.0-src.tar.gz) = 58d9ed8160af2842fe4338ae265d591b9f96293f8997c420721e86f8c8ffce5b3a5dbc83b87b813ea68505b56cbddd02332540f0a4e01bdc7f7f36e357ba2b7a