.apache-commons-compress.metadata

@@ -0,0 +1 @@
+df2eaf0fe313ac68f0ace6e460fa56633051472b SOURCES/commons-compress-1.19-src.tar.gz

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,29 +1 @@
-/results_*
+SOURCES/commons-compress-1.19-src.tar.gz
-/*.src.rpm
-
-/commons-compress-1.0-src.tar.gz
-/commons-compress-1.1-src.tar.gz
-/commons-compress-1.2-src.tar.gz
-/commons-compress-1.3-src.tar.gz
-/commons-compress-1.4-src.tar.gz
-/commons-compress-1.4.1-src.tar.gz
-/commons-compress-1.5-src.tar.gz
-/commons-compress-1.6-src.tar.gz
-/commons-compress-1.7-src.tar.gz
-/commons-compress-1.8-src.tar.gz
-/commons-compress-1.8.1-src.tar.gz
-/commons-compress-1.9-src.tar.gz
-/commons-compress-1.10-SNAPSHOT.tar.xz
-/commons-compress-1.11-src.tar.gz
-/commons-compress-1.12-src.tar.gz
-/commons-compress-1.13-src.tar.gz
-/commons-compress-1.14-src.tar.gz
-/commons-compress-1.15-src.tar.gz
-/commons-compress-1.16.1-src.tar.gz
-/commons-compress-1.17-src.tar.gz
-/commons-compress-1.18-src.tar.gz
-/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
-/commons-compress-1.27.1-src.tar.gz

0003-Remove-Pack200-compressor.patch

@@ -1,54 +0,0 @@
-From d31ed816bd3dc7743cba7e1196c730f41cdf98e0 Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Mon, 11 Mar 2024 12:16:28 +0100
-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 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
- 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;
-@@ -249,10 +247,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
-             return GZIP;
-         }
- 
--        if (compressorNames.contains(PACK200) && Pack200CompressorInputStream.matches(signature, signatureLength)) {
--            return PACK200;
--        }
--
-         if (compressorNames.contains(SNAPPY_FRAMED) && FramedSnappyCompressorInputStream.matches(signature, signatureLength)) {
-             return SNAPPY_FRAMED;
-         }
-@@ -558,7 +552,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)) {
-@@ -631,7 +625,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.44.0
-

SOURCES/0001-Remove-Brotli-compressor.patch

@@ -8,7 +8,7 @@ Subject: [PATCH 1/3] Remove Brotli compressor
  1 file changed, 1 insertion(+), 6 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 db0d305..0f1394f 100644
+index d730b9d..ab178a9 100644
 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
 +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
 @@ -31,8 +31,6 @@ import java.util.Set;
@@ -20,7 +20,7 @@ index db0d305..0f1394f 100644
  import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
  import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
  import org.apache.commons.compress.compressors.deflate.DeflateCompressorInputStream;
-@@ -579,10 +577,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+@@ -586,10 +584,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              }
  
              if (BROTLI.equalsIgnoreCase(name)) {

SOURCES/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 95b6e45..16bc88e 100644
+index ab178a9..3817704 100644
 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
 +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
-@@ -53,9 +53,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
+@@ -54,9 +54,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 95b6e45..16bc88e 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.Sets;
+ import org.apache.commons.compress.utils.Lists;
- 
+ import org.apache.commons.compress.utils.ServiceLoaderIterator;
-@@ -297,10 +294,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+@@ -516,10 +513,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              return LZ4_FRAMED;
          }
  
--        if (compressorNames.contains(ZSTANDARD) && ZstdUtils.matches(signature, signatureLength)) {
+-        if (ZstdUtils.matches(signature, signatureLength)) {
 -            return ZSTANDARD;
 -        }
 -
          throw new CompressorException("No Compressor found for the stream signature.");
      }
- 
+     /**
-@@ -615,10 +608,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+@@ -595,10 +588,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              }
  
              if (ZSTANDARD.equalsIgnoreCase(name)) {
@@ -44,7 +44,7 @@ index 95b6e45..16bc88e 100644
              }
  
              if (LZMA.equalsIgnoreCase(name)) {
-@@ -734,7 +724,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+@@ -714,7 +704,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
              }
  
              if (ZSTANDARD.equalsIgnoreCase(name)) {
@@ -54,5 +54,5 @@ index 95b6e45..16bc88e 100644
          } catch (final IOException e) {
              throw new CompressorException("Could not create CompressorOutputStream", e);
 -- 
-2.43.0
+2.20.1
 

SOURCES/0003-Avoid-use-of-internal-Mockito-API.patch

@@ -0,0 +1,32 @@
+From 4dd332d8f82d3a5f0ac6654d2c1733e44da6ddbd Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Thu, 7 Feb 2019 14:57:25 +0000
+Subject: [PATCH 3/3] Avoid use of internal Mockito API
+
+---
+ .../compress/utils/FixedLengthBlockOutputStreamTest.java        | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
+index cfda61b..e94ccee 100644
+--- a/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
++++ b/src/test/java/org/apache/commons/compress/utils/FixedLengthBlockOutputStreamTest.java
+@@ -39,7 +39,6 @@ import java.nio.file.Path;
+ import java.util.concurrent.atomic.AtomicBoolean;
+ import org.hamcrest.core.IsInstanceOf;
+ import org.junit.Test;
+-import org.mockito.internal.matchers.GreaterOrEqual;
+ 
+ public class FixedLengthBlockOutputStreamTest {
+ 
+@@ -294,7 +293,6 @@ public class FixedLengthBlockOutputStreamTest {
+ 
+     private static void assertContainsAtOffset(String msg, byte[] expected, int offset,
+         byte[] actual) {
+-        assertThat(actual.length, new GreaterOrEqual<>(offset + expected.length));
+         for (int i = 0; i < expected.length; i++) {
+             assertEquals(String.format("%s ([%d])", msg, i), expected[i], actual[i + offset]);
+         }
+-- 
+2.20.1
+

SPECS/apache-commons-compress.spec

@@ -1,34 +1,25 @@
-%bcond_with bootstrap
-
 Name:           apache-commons-compress
-Version:        1.27.1
+Version:        1.19
-Release:        4%{?dist}
+Release:        2%{?dist}
 Summary:        Java API for working with compressed files and archivers
-License:        Apache-2.0
+License:        ASL 2.0
-URL:            https://commons.apache.org/proper/commons-compress/
+URL:            http://commons.apache.org/proper/commons-compress/
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
-Source0:        https://archive.apache.org/dist/commons/compress/source/commons-compress-%{version}-src.tar.gz
+Source0:        http://archive.apache.org/dist/commons/compress/source/commons-compress-%{version}-src.tar.gz
 
-Patch:          0001-Remove-Brotli-compressor.patch
+Patch0:         0001-Remove-Brotli-compressor.patch
-Patch:          0002-Remove-ZSTD-compressor.patch
+Patch1:         0002-Remove-ZSTD-compressor.patch
-Patch:          0003-Remove-Pack200-compressor.patch
+Patch2:         0003-Avoid-use-of-internal-Mockito-API.patch
 
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
 BuildRequires:  maven-local
-BuildRequires:  mvn(commons-codec:commons-codec)
+BuildRequires:  mvn(junit:junit)
-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)
+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
 
 %description
 The Apache Commons Compress library defines an API for working with
@@ -40,149 +31,61 @@ but it has been removed form this package.
 Summary:        API documentation for %{name}
 
 %description javadoc
-API documentation for %{name}.
+This package provides %{summary}.
 
 %prep
-%autosetup -p1 -n commons-compress-%{version}-src
+%setup -q -n commons-compress-%{version}-src
 
 # Unavailable Google Brotli library (org.brotli.dec)
+%patch0 -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
 %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
+# Avoid using internal Mockito APIs
-rm -r src/{main,test}/java/org/apache/commons/compress/harmony
+%patch2 -p1
-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 -r src/test/java/org/apache/commons/compress/compressors/pack200
-rm src/test/java/org/apache/commons/compress/java/util/jar/Pack200Test.java
 
 # remove osgi tests, we don't have deps for them
 %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
+# Remove test that requires powermock
-%pom_remove_dep com.github.marschall:memoryfilesystem
+%pom_remove_dep org.powermock:
-rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTest.java
+%pom_add_dep org.mockito:mockito-core::test
+rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java
 
 %build
 %mvn_file  : commons-compress %{name}
 %mvn_alias : commons:
-# XXX failing tests, need to investigate why
+%if 0%{?rhel} && 0%{?rhel} <= 7
-%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.compress
+export LC_ALL=en_US.UTF-8
+%endif
+%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.compress
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%license LICENSE.txt NOTICE.txt
+%doc LICENSE.txt NOTICE.txt
 
 %files javadoc -f .mfiles-javadoc
-%license LICENSE.txt NOTICE.txt
+%doc LICENSE.txt NOTICE.txt
 
 %changelog
-* Fri Nov 29 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.27.1-3
-- Update javapackages test plan to f42
-
-* Tue Sep 03 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.27.1-2
-- Use %%autosetup -C
-
-* Fri Aug 23 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.27.1-1
-- Update to upstream version 1.27.1
-- Resolves: rhbz#2283072
-
-* Wed Jul 24 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.25.0-7
-- Install license files in licensedir instead of docdir
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.25.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.25.0-5
-- Rebuilt for java-21-openjdk as system jdk
-
-* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 1.25.0-4
-- bump of release for for java-21-openjdk as system jdk
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.25.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.25.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* 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
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.21-3
-- Rebuilt for java-17-openjdk as system jdk
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Aug 06 2021 Marian Koncek <mkoncek@redhat.com> - 1.21-1
-- Update to upstream version 1.21
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.20-6
-- Bootstrap build
-- Non-bootstrap build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 16 2020 Mat Booth <mat.booth@redhat.com> - 1.20-3
-- Ensure Java 8 level bytecode when built on Java 11
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.20-2
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Mar 04 2020 Marian Koncek <mkoncek@redhat.com> - 1.20-1
-- Update to upstream version 1.20
-
-* Mon Mar 02 2020 Fabio Valentini <decathorpe@gmail.com> - 1.20-1
-- Update to version 1.20.
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.19-2
 - Mass rebuild for javapackages-tools 201902
 
-* 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.
-
 * Mon Sep 02 2019 Marian Koncek <mkoncek@redhat.com> - 1.19-1
 - Update to upstream version 1.19
 
-* 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
-
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.18-6
 - Mass rebuild for javapackages-tools 201901
 
@@ -222,7 +125,7 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe
 
 * Wed Jun 14 2017 Roman Vais <rvais@redhat.com> - 1.14-1
 - Update to upstream version 1.14
-- Remove Brotli support, it is not packaged for fedora
+- Remove Brotli support, it is not packaged for fedora 
 
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
@@ -335,7 +238,7 @@ rm src/test/java/org/apache/commons/compress/archivers/tar/TarMemoryFileSystemTe
 - Fixed Maven depmap to use commons-compress
 
 * Thu May 13 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-5
-- Added missing Provides/Obsoletes for javadocs
+- Added missing Provides/Obsoletes for javadocs 
 
 * Mon May 10 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-4
 - Cleared some problems after the review

ci.fmf

@@ -1 +0,0 @@
-resultsdb-testcase: separate

gating.yaml

@@ -1,7 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-9
-decision_contexts:
-  - osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}

plans/javapackages.fmf

@@ -1,7 +0,0 @@
-summary: Run javapackages-specific tests
-discover:
-  how: fmf
-  url: https://src.fedoraproject.org/tests/javapackages
-  ref: c9s
-execute:
-  how: tmt

sources

@@ -1 +0,0 @@
-SHA512 (commons-compress-1.27.1-src.tar.gz) = c7a2cef26959e687ad19b96b5ba8393d7514095e13bf0f29bd41e6b3c3cb2260d8ff23283ff3d5fd137b2522b843e7f0f50ab46bcf0f66df5383674f35f223ab