.gitignore

@@ -1 +1 @@
-SOURCES/plexus-archiver-4.2.4.tar.gz
+SOURCES/plexus-archiver-4.9.1.tar.gz

.plexus-archiver.metadata

@@ -1 +1 @@
-a21a59111ef3744829b5adecfdaa2c605a818a4f SOURCES/plexus-archiver-4.2.4.tar.gz
+213aeb9b429118bb2c5daca98b410fdad6f3e77b SOURCES/plexus-archiver-4.9.1.tar.gz

SOURCES/0001-Remove-support-for-snappy.patch

@@ -1,55 +1,56 @@
-From 6e2004d90deab2f59af01629187006e320444e34 Mon Sep 17 00:00:00 2001
+From b69df21577ded31859da039434bab79cb7c5b5e6 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Sat, 23 Sep 2017 11:43:45 +0200
 Subject: [PATCH] Remove support for snappy
 
+Forwarded: not-needed
 ---
  .../java/org/codehaus/plexus/archiver/tar/TarArchiver.java     | 3 +--
  .../java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java   | 3 +--
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
-index 8eec881..be8e7a3 100644
+index cae07804..7fc30ba1 100644
 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
 +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
-@@ -38,7 +38,6 @@
+@@ -42,7 +42,6 @@
  import org.codehaus.plexus.components.io.resources.PlexusIoResource;
  import org.codehaus.plexus.util.IOUtil;
  import org.codehaus.plexus.util.StringUtils;
 -import org.iq80.snappy.SnappyOutputStream;
+ 
  import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
  
- /**
+@@ -426,7 +425,7 @@ private OutputStream compress(TarCompressionMethod tarCompressionMethod, final O
-@@ -489,7 +488,7 @@ else if ( TarCompressionMethod.bzip2.equals( tarCompressionMethod ) )
+         } else if (TarCompressionMethod.bzip2.equals(tarCompressionMethod)) {
-         }
+             return new BZip2CompressorOutputStream(bufferedOutputStream(ostream));
-         else if ( TarCompressionMethod.snappy.equals( tarCompressionMethod ) )
+         } else if (TarCompressionMethod.snappy.equals(tarCompressionMethod)) {
-         {
 -            return new SnappyOutputStream(bufferedOutputStream(ostream));
 +            throw new UnsupportedOperationException("This version of plexus-archiver does not upport snappy compression");
-         }
+         } else if (TarCompressionMethod.xz.equals(tarCompressionMethod)) {
-         else if ( TarCompressionMethod.xz.equals( tarCompressionMethod ) )
+             return new XZCompressorOutputStream(bufferedOutputStream(ostream));
-         {
+         } else if (TarCompressionMethod.zstd.equals(tarCompressionMethod)) {
 diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
-index 2316d4e..c2e2b83 100644
+index 1b0b7950..52cae0c9 100644
 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
 +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
-@@ -31,7 +31,6 @@
+@@ -32,7 +32,6 @@
+ import org.codehaus.plexus.archiver.ArchiverException;
  import org.codehaus.plexus.archiver.util.Streams;
  import org.codehaus.plexus.components.io.filemappers.FileMapper;
- import org.codehaus.plexus.util.IOUtil;
+-import org.iq80.snappy.SnappyFramedInputStream;
--import org.iq80.snappy.SnappyInputStream;
  
- /**
+ import static org.codehaus.plexus.archiver.util.Streams.bufferedInputStream;
-  * @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
+ import static org.codehaus.plexus.archiver.util.Streams.fileInputStream;
-@@ -154,7 +153,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 )
+@@ -137,7 +136,7 @@ private InputStream decompress(UntarCompressionMethod compression, final File fi
-         }
+         } else if (compression == UntarCompressionMethod.BZIP2) {
-         else if ( compression == UntarCompressionMethod.SNAPPY )
+             return new BZip2CompressorInputStream(istream);
-         {
+         } else if (compression == UntarCompressionMethod.SNAPPY) {
--            return new SnappyInputStream( istream, true );
+-            return new SnappyFramedInputStream(istream, true);
 +            throw new UnsupportedOperationException("This version of plexus-archiver does not upport snappy compression");
-         }
+         } else if (compression == UntarCompressionMethod.XZ) {
-         else if ( compression == UntarCompressionMethod.XZ )
+             return new XZCompressorInputStream(istream);
-         {
+         } else if (compression == UntarCompressionMethod.ZSTD) {
 -- 
-2.21.0
+2.41.0
 

SOURCES/0002-Remove-support-for-zstd.patch

@@ -0,0 +1,56 @@
+From 01dc5709a908158ca5f59e4312df772f81d2fef8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mari=C3=A1n=20Kon=C4=8Dek?= <marian.koncek@mailbox.org>
+Date: Fri, 11 Aug 2023 14:04:26 +0200
+Subject: [PATCH] Remove support for zstd
+
+Forwarded: not-needed
+---
+ .../java/org/codehaus/plexus/archiver/tar/TarArchiver.java     | 3 +--
+ .../java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java   | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
+index 7fc30ba1..68433734 100644
+--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
++++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
+@@ -29,7 +29,6 @@
+ import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+ import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
+ import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
+-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
+ import org.codehaus.plexus.archiver.AbstractArchiver;
+ import org.codehaus.plexus.archiver.ArchiveEntry;
+ import org.codehaus.plexus.archiver.ArchiverException;
+@@ -429,7 +428,7 @@ private OutputStream compress(TarCompressionMethod tarCompressionMethod, final O
+         } else if (TarCompressionMethod.xz.equals(tarCompressionMethod)) {
+             return new XZCompressorOutputStream(bufferedOutputStream(ostream));
+         } else if (TarCompressionMethod.zstd.equals(tarCompressionMethod)) {
+-            return new ZstdCompressorOutputStream(bufferedOutputStream(ostream));
++            throw new UnsupportedOperationException("This version of plexus-archiver does not upport zstd compression");
+         }
+ 
+         return ostream;
+diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
+index 52cae0c9..4c0e70c1 100644
+--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
++++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
+@@ -27,7 +27,6 @@
+ import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+ import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
+ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
+-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
+ import org.codehaus.plexus.archiver.AbstractUnArchiver;
+ import org.codehaus.plexus.archiver.ArchiverException;
+ import org.codehaus.plexus.archiver.util.Streams;
+@@ -140,7 +139,7 @@ private InputStream decompress(UntarCompressionMethod compression, final File fi
+         } else if (compression == UntarCompressionMethod.XZ) {
+             return new XZCompressorInputStream(istream);
+         } else if (compression == UntarCompressionMethod.ZSTD) {
+-            return new ZstdCompressorInputStream(istream);
++            throw new UnsupportedOperationException("This version of plexus-archiver does not upport zstd compression");
+         }
+         return istream;
+     }
+-- 
+2.41.0
+

SPECS/plexus-archiver.spec

@@ -1,30 +1,38 @@
 %bcond_with bootstrap
 
 Name:           plexus-archiver
-Version:        4.2.4
+Version:        4.9.1
-Release:        5%{?dist}
+Release:        4%{?dist}
 Summary:        Plexus Archiver Component
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            https://codehaus-plexus.github.io/plexus-archiver
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://github.com/codehaus-plexus/plexus-archiver/archive/plexus-archiver-%{version}.tar.gz
 
-Patch0:         0001-Remove-support-for-snappy.patch
+Patch1:         0001-Remove-support-for-snappy.patch
+Patch2:         0002-Remove-support-for-zstd.patch
 
-BuildRequires:  maven-local
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
+BuildRequires:  maven-local
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
-BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(com.google.inject:guice)
+BuildRequires:  mvn(commons-io:commons-io)
+BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(org.apache.commons:commons-compress)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires:  mvn(org.assertj:assertj-core)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-io)
-BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
+BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
+BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
+BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-api)
+BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-params)
+BuildRequires:  mvn(org.slf4j:slf4j-api)
+BuildRequires:  mvn(org.slf4j:slf4j-simple)
 BuildRequires:  mvn(org.tukaani:xz)
 %endif
 
@@ -44,18 +52,28 @@ Javadoc for %{name}.
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
+%patch 1 -p1
+%patch 2 -p1
+
 %mvn_file :%{name} plexus/archiver
 
-%patch0 -p1
 %pom_remove_dep org.iq80.snappy:snappy
-rm -rf src/main/java/org/codehaus/plexus/archiver/snappy
+rm -r src/main/java/org/codehaus/plexus/archiver/snappy
-rm -f src/main/java/org/codehaus/plexus/archiver/tar/SnappyTarFile.java
+rm -r src/test/java/org/codehaus/plexus/archiver/snappy
-rm -f src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResourceCollection.java
+rm src/main/java/org/codehaus/plexus/archiver/tar/SnappyTarFile.java
-rm src/test/java/org/codehaus/plexus/archiver/snappy/SnappyArchiverTest.java
+rm src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResourceCollection.java
 rm src/test/java/org/codehaus/plexus/archiver/tar/TarSnappyUnArchiverTest.java
 
-# Tests use old plexus-containers-default
+%pom_remove_dep com.github.luben:zstd-jni
-sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java
+rm -r src/main/java/org/codehaus/plexus/archiver/zstd
+rm -r src/test/java/org/codehaus/plexus/archiver/zstd
+rm src/main/java/org/codehaus/plexus/archiver/tar/ZstdTarFile.java
+rm src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarZstdFileResourceCollection.java
+rm src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTZstdFileResourceCollection.java
+rm src/test/java/org/codehaus/plexus/archiver/tar/TarZstdUnArchiverTest.java
+
+# Fails due to previously removed compressors
+rm src/test/java/org/codehaus/plexus/archiver/manager/ArchiverManagerTest.java
 
 %build
 %mvn_build
@@ -70,15 +88,61 @@ sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/Duplicat
 %license LICENSE
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.2.4-5
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 4.9.1-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Bump release for October 2024 mass rebuild:
-  Related: rhbz#1991688
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.9.1-3
+- Rebuilt for MSVSphere 10
+
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 4.9.1-3
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.9.1-2
+- Bump release for June 2024 mass rebuild
+
+* Thu Feb 01 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.9.1-1
+- Update to upstream version 4.9.1
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 04 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.9.0-1
+- Update to upstream version 4.9.0
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.8.0-2
+- Rebuild
+
+* Thu Aug 17 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.8.0-1
+- Update to upstream version 4.8.0
+
+* Thu Aug 17 2023 Marian Koncek <mkoncek@redhat.com> - 4.7.1-1
+- Update to upstream version 4.7.1
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Apr 24 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.7-1
+- Update to upstream version 4.2.7
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.2.4-5
+- Rebuilt for java-17-openjdk as system jdk
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.4-4
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.4-4
-- Rebuild to workaround DistroBaker issue
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.4-3
+* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.4-3
-- Bootstrap Maven for CentOS Stream 9
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.4-2
 - Bootstrap build