diff --git a/.gitignore b/.gitignore index 43a56f0..c566692 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /plexus-archiver-4.2.3.tar.gz /plexus-archiver-4.2.4.tar.gz /plexus-archiver-4.2.7.tar.gz +/plexus-archiver-4.7.1.tar.gz diff --git a/0001-Remove-support-for-snappy.patch b/0001-Remove-support-for-snappy.patch index 8a684cd..eed1d7f 100644 --- a/0001-Remove-support-for-snappy.patch +++ b/0001-Remove-support-for-snappy.patch @@ -9,10 +9,10 @@ Subject: [PATCH] Remove support for snappy 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 46978ab9..3d8ffcc8 100644 +index f63e0e5..5aedfc9 100644 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java -@@ -41,7 +41,6 @@ +@@ -44,7 +44,6 @@ import org.codehaus.plexus.components.io.resources.PlexusIoResource; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; @@ -20,36 +20,36 @@ index 46978ab9..3d8ffcc8 100644 /** * @author Emmanuel Venisse -@@ -498,7 +497,7 @@ else if ( TarCompressionMethod.bzip2.equals( tarCompressionMethod ) ) +@@ -503,7 +502,7 @@ else if ( TarCompressionMethod.bzip2.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" ); ++ throw new UnsupportedOperationException( "This version of plexus-archiver does not support snappy compression" ); } else if ( TarCompressionMethod.xz.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 6a5b43c6..a46c3007 100644 +index d88c3dd..ddb7b12 100644 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java -@@ -32,7 +32,6 @@ +@@ -35,7 +35,6 @@ import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.util.Streams; import org.codehaus.plexus.components.io.filemappers.FileMapper; --import org.iq80.snappy.SnappyInputStream; +-import org.iq80.snappy.SnappyFramedInputStream; /** * @author Emmanuel Venisse -@@ -150,7 +149,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 ) +@@ -154,7 +153,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 ) } else if ( compression == UntarCompressionMethod.SNAPPY ) { -- return new SnappyInputStream( istream, true ); -+ throw new UnsupportedOperationException( "This version of plexus-archiver does not upport snappy compression" ); +- return new SnappyFramedInputStream( istream, true ); ++ throw new UnsupportedOperationException( "This version of plexus-archiver does not support snappy compression" ); } else if ( compression == UntarCompressionMethod.XZ ) { -- -2.35.1 +2.41.0 diff --git a/0002-Remove-support-for-zstd.patch b/0002-Remove-support-for-zstd.patch new file mode 100644 index 0000000..1e4d7aa --- /dev/null +++ b/0002-Remove-support-for-zstd.patch @@ -0,0 +1,55 @@ +From cec8a488028be8e1bff1fcde35818a5b1babc2b7 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Tue, 18 Jul 2023 15:40:59 +0200 +Subject: [PATCH 2/2] Remove support for zstd + +--- + .../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 5aedfc9..87355e6 100644 +--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java ++++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java +@@ -31,7 +31,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; +@@ -510,7 +509,7 @@ else if ( TarCompressionMethod.xz.equals( tarCompressionMethod ) ) + } + else if ( TarCompressionMethod.zstd.equals( tarCompressionMethod ) ) + { +- return new ZstdCompressorOutputStream( bufferedOutputStream( ostream ) ); ++ throw new UnsupportedOperationException( "This version of plexus-archiver does not support 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 ddb7b12..d27f377 100644 +--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java ++++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java +@@ -30,7 +30,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; +@@ -161,7 +160,7 @@ else if ( compression == UntarCompressionMethod.XZ ) + } + else if ( compression == UntarCompressionMethod.ZSTD ) + { +- return new ZstdCompressorInputStream( istream ); ++ throw new UnsupportedOperationException( "This version of plexus-archiver does not support zstd compression" ); + } + return istream; + } +-- +2.41.0 + diff --git a/plexus-archiver.spec b/plexus-archiver.spec index 46549be..00647b6 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: plexus-archiver -Version: 4.2.7 -Release: 4%{?dist} +Version: 4.7.1 +Release: 1%{?dist} Summary: Plexus Archiver Component License: Apache-2.0 URL: https://codehaus-plexus.github.io/plexus-archiver @@ -11,7 +11,8 @@ 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 %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -21,11 +22,16 @@ BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(junit:junit) 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.eclipse.sisu:sisu-maven-plugin) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) BuildRequires: mvn(org.tukaani:xz) %endif @@ -45,18 +51,27 @@ 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 -f src/main/java/org/codehaus/plexus/archiver/tar/SnappyTarFile.java -rm -f src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResourceCollection.java -rm src/test/java/org/codehaus/plexus/archiver/snappy/SnappyArchiverTest.java +rm -r src/main/java/org/codehaus/plexus/archiver/snappy +rm -r src/test/java/org/codehaus/plexus/archiver/snappy +rm src/main/java/org/codehaus/plexus/archiver/tar/SnappyTarFile.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 -sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java +%pom_remove_dep com.github.luben:zstd-jni +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/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 @@ -71,6 +86,9 @@ sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/Duplicat %license LICENSE %changelog +* Thu Aug 17 2023 Marian Koncek - 4.7.1-1 +- Update to upstream version 4.7.1 + * Fri Jul 21 2023 Fedora Release Engineering - 4.2.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index da52f48..dbab174 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plexus-archiver-4.2.7.tar.gz) = 762e8b1be9c653c210c80bcd379336ee5191c21d62d6a839836ea3032361ced7dbe725038a7b25810d9fe22440a7c916b37f19e4ee8c8950d346afb2906064a7 +SHA512 (plexus-archiver-4.7.1.tar.gz) = 0499561fa38e968601f4fb80493edb9b43d5e570c27bdc7e304cc380f68f7cec1a392dc8858b0a1eba9db71eccc6f3ac25f87b8411cc7779970cfa6dd5d9e11a