Update to upstream version 1.27.1

Resolves: RHEL-74141

.gitignore

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

0003-Remove-Pack200-compressor.patch

@@ -1,6 +1,6 @@
-From 2db4e6319326e584051ebefd565675356ab0a3cc Mon Sep 17 00:00:00 2001
+From d31ed816bd3dc7743cba7e1196c730f41cdf98e0 Mon Sep 17 00:00:00 2001
 From: Marian Koncek <mkoncek@redhat.com>
-Date: Fri, 8 Dec 2023 14:18:18 +0100
+Date: Mon, 11 Mar 2024 12:16:28 +0100
 Subject: [PATCH] Remove Pack200 compressor
 
 ---
@@ -8,7 +8,7 @@ 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 16bc88e..f3c7f3f 100644
+index a980aef..dc6aeb9 100644
 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
 +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
 @@ -44,8 +44,6 @@ import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorOutputStre
@@ -20,7 +20,7 @@ index 16bc88e..f3c7f3f 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;
-@@ -265,10 +263,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+@@ -249,10 +247,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              return GZIP;
          }
  
@@ -28,10 +28,10 @@ index 16bc88e..f3c7f3f 100644
 -            return PACK200;
 -        }
 -
-         if (compressorNames.contains(SNAPPY_FRAMED) &&
+         if (compressorNames.contains(SNAPPY_FRAMED) && FramedSnappyCompressorInputStream.matches(signature, signatureLength)) {
-                 FramedSnappyCompressorInputStream.matches(signature, signatureLength)) {
              return SNAPPY_FRAMED;
-@@ -619,7 +613,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+         }
+@@ -558,7 +552,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              }
  
              if (PACK200.equalsIgnoreCase(name)) {
@@ -40,7 +40,7 @@ index 16bc88e..f3c7f3f 100644
              }
  
              if (SNAPPY_RAW.equalsIgnoreCase(name)) {
-@@ -700,7 +694,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+@@ -631,7 +625,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              }
  
              if (PACK200.equalsIgnoreCase(name)) {
@@ -50,5 +50,5 @@ index 16bc88e..f3c7f3f 100644
  
              if (LZMA.equalsIgnoreCase(name)) {
 -- 
-2.43.0
+2.44.0
 

apache-commons-compress.spec

@@ -1,8 +1,8 @@
 %bcond_with bootstrap
 
 Name:           apache-commons-compress
-Version:        1.25.0
+Version:        1.27.1
-Release:        6%{?dist}
+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,14 +11,17 @@ ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://archive.apache.org/dist/commons/compress/source/commons-compress-%{version}-src.tar.gz
 
-Patch1:         0001-Remove-Brotli-compressor.patch
+Patch:          0001-Remove-Brotli-compressor.patch
-Patch2:         0002-Remove-ZSTD-compressor.patch
+Patch:          0002-Remove-ZSTD-compressor.patch
-Patch3:         0003-Remove-Pack200-compressor.patch
+Patch:          0003-Remove-Pack200-compressor.patch
 
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
 BuildRequires:  maven-local
+BuildRequires:  mvn(commons-codec:commons-codec)
+BuildRequires:  mvn(commons-io:commons-io)
+BuildRequires:  mvn(org.apache.commons:commons-lang3)
 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)
@@ -40,20 +43,17 @@ Summary:        API documentation for %{name}
 This package provides %{summary}.
 
 %prep
-%setup -q -n commons-compress-%{version}-src
+%autosetup -p1 -n commons-compress-%{version}-src
 
 # Unavailable Google Brotli library (org.brotli.dec)
-%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
-%patch 2 -p1
 %pom_remove_dep :zstd-jni
 rm -r src/{main,test}/java/org/apache/commons/compress/compressors/zstandard
 
 # Remove support for pack200 which depends on ancient asm:asm:3.2
-%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
@@ -64,8 +64,6 @@ rm src/test/java/org/apache/commons/compress/java/util/jar/Pack200Test.java
 %pom_remove_dep org.ops4j.pax.exam:::test
 %pom_remove_dep :org.apache.felix.framework::test
 %pom_remove_dep :javax.inject::test
-%pom_remove_dep :slf4j-api::test
-rm src/test/java/org/apache/commons/compress/OsgiITest.java
 
 # Not packaged
 %pom_remove_dep com.github.marschall:memoryfilesystem
@@ -81,12 +79,15 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jan 15 2025 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.27.1-1
+- Update to upstream version 1.27.1
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.25.0-6
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018

sources

@@ -1 +1 @@
-SHA512 (commons-compress-1.25.0-src.tar.gz) = 58d9ed8160af2842fe4338ae265d591b9f96293f8997c420721e86f8c8ffce5b3a5dbc83b87b813ea68505b56cbddd02332540f0a4e01bdc7f7f36e357ba2b7a
+SHA512 (commons-compress-1.27.1-src.tar.gz) = c7a2cef26959e687ad19b96b5ba8393d7514095e13bf0f29bd41e6b3c3cb2260d8ff23283ff3d5fd137b2522b843e7f0f50ab46bcf0f66df5383674f35f223ab