From 1d5a93f4f922020dab894a90d5b5169e27e25595 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 13 Mar 2025 14:06:09 +0000 Subject: [PATCH] import CS plexus-archiver-4.10.0-3.module_el9+1171+eb38a622 --- .gitignore | 2 +- .plexus-archiver.metadata | 2 +- SOURCES/0001-Remove-support-for-snappy.patch | 75 ++++---- SOURCES/0002-Remove-support-for-zstd.patch | 56 ++++++ SPECS/plexus-archiver.spec | 178 ++++++++++++++++--- 5 files changed, 253 insertions(+), 60 deletions(-) create mode 100644 SOURCES/0002-Remove-support-for-zstd.patch diff --git a/.gitignore b/.gitignore index 17e4128..4529806 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/plexus-archiver-4.2.0.tar.gz +SOURCES/plexus-archiver-4.10.0.tar.gz diff --git a/.plexus-archiver.metadata b/.plexus-archiver.metadata index eee3755..e18c5bd 100644 --- a/.plexus-archiver.metadata +++ b/.plexus-archiver.metadata @@ -1 +1 @@ -b86b30a0888dc9348e5c79a10a5e0f7e9aeaa159 SOURCES/plexus-archiver-4.2.0.tar.gz +aced3ad295520417019f3d25d64fa52c5691138b SOURCES/plexus-archiver-4.10.0.tar.gz diff --git a/SOURCES/0001-Remove-support-for-snappy.patch b/SOURCES/0001-Remove-support-for-snappy.patch index 98920a2..be7547e 100644 --- a/SOURCES/0001-Remove-support-for-snappy.patch +++ b/SOURCES/0001-Remove-support-for-snappy.patch @@ -1,55 +1,56 @@ -From 6e2004d90deab2f59af01629187006e320444e34 Mon Sep 17 00:00:00 2001 +From 5f3ef9f786db6adc09b491ff049880744076a203 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 23 Sep 2017 11:43:45 +0200 -Subject: [PATCH] Remove support for snappy +Subject: [PATCH 1/2] 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 ba53a1b9..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 @@ - 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; +@@ -25,7 +25,6 @@ + import java.nio.file.Files; + import java.util.zip.GZIPOutputStream; - /** -@@ -489,7 +488,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" ); - } - else if ( TarCompressionMethod.xz.equals( tarCompressionMethod ) ) - { +-import io.airlift.compress.snappy.SnappyFramedOutputStream; + import org.apache.commons.compress.archivers.tar.TarArchiveEntry; + import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; + import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; +@@ -426,7 +425,7 @@ private OutputStream compress(TarCompressionMethod tarCompressionMethod, final O + } else if (TarCompressionMethod.bzip2.equals(tarCompressionMethod)) { + return new BZip2CompressorOutputStream(bufferedOutputStream(ostream)); + } else if (TarCompressionMethod.snappy.equals(tarCompressionMethod)) { +- return new SnappyFramedOutputStream(bufferedOutputStream(ostream)); ++ throw new UnsupportedOperationException("This version of plexus-archiver does not upport snappy compression"); + } 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 507cb6cb..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 @@ - 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.SnappyInputStream; +@@ -23,7 +23,6 @@ + import java.io.InputStream; + import java.util.zip.GZIPInputStream; - /** - * @author Emmanuel Venisse -@@ -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" ); - } - else if ( compression == UntarCompressionMethod.XZ ) - { +-import io.airlift.compress.snappy.SnappyFramedInputStream; + import org.apache.commons.compress.archivers.tar.TarArchiveEntry; + import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; + import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; +@@ -137,7 +136,7 @@ private InputStream decompress(UntarCompressionMethod compression, final File fi + } else if (compression == UntarCompressionMethod.BZIP2) { + return new BZip2CompressorInputStream(istream); + } else if (compression == UntarCompressionMethod.SNAPPY) { +- return new SnappyFramedInputStream(istream, true); ++ throw new UnsupportedOperationException("This version of plexus-archiver does not upport snappy compression"); + } else if (compression == UntarCompressionMethod.XZ) { + return new XZCompressorInputStream(istream); + } else if (compression == UntarCompressionMethod.ZSTD) { -- -2.21.0 +2.46.0 diff --git a/SOURCES/0002-Remove-support-for-zstd.patch b/SOURCES/0002-Remove-support-for-zstd.patch new file mode 100644 index 0000000..b350aea --- /dev/null +++ b/SOURCES/0002-Remove-support-for-zstd.patch @@ -0,0 +1,56 @@ +From ff7178ca8f0728a2bc6d5d12d74e9c47de2c37a8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mari=C3=A1n=20Kon=C4=8Dek?= +Date: Fri, 11 Aug 2023 14:04:26 +0200 +Subject: [PATCH 2/2] 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.46.0 + diff --git a/SPECS/plexus-archiver.spec b/SPECS/plexus-archiver.spec index ff6d2bd..f7ac091 100644 --- a/SPECS/plexus-archiver.spec +++ b/SPECS/plexus-archiver.spec @@ -1,26 +1,40 @@ +%bcond_with bootstrap + Name: plexus-archiver -Version: 4.2.0 -Release: 2%{?dist} +Version: 4.10.0 +Release: 3%{?dist} Summary: Plexus Archiver Component -License: ASL 2.0 -URL: http://codehaus-plexus.github.io/plexus-archiver +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 +Patch: 0001-Remove-support-for-snappy.patch +Patch: 0002-Remove-support-for-zstd.patch +%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.codehaus.plexus:plexus-component-metadata) -BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) +BuildRequires: mvn(org.assertj:assertj-core) 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 %description The Plexus project seeks to create end-to-end developer tools for @@ -31,25 +45,33 @@ velocity, etc. Plexus also includes an application server which is like a J2EE application server, without all the baggage. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -Javadoc for %{name}. +API documentation for %{name}. %prep -%setup -q -n %{name}-%{name}-%{version} +%autosetup -p1 -n %{name}-%{name}-%{version} + %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 +%pom_remove_dep io.airlift:aircompressor +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/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 @@ -64,18 +86,132 @@ sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/Duplicat %license LICENSE %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 4.10.0-2 +- Update javapackages test plan to f42 + +* Fri Aug 23 2024 Mikolaj Izdebski - 4.10.0-1 +- Update to upstream version 4.10.0 +- Resolves: rhbz#2269638 + +* Fri Jul 19 2024 Fedora Release Engineering - 4.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 4.9.1-3 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 4.9.1-2 +- bump of release for for java-21-openjdk as system jdk + +* Thu Feb 01 2024 Mikolaj Izdebski - 4.9.1-1 +- Update to upstream version 4.9.1 + +* Thu Jan 25 2024 Fedora Release Engineering - 4.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 4.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 04 2023 Mikolaj Izdebski - 4.9.0-1 +- Update to upstream version 4.9.0 + +* Fri Sep 01 2023 Mikolaj Izdebski - 4.8.0-2 +- Rebuild + +* Thu Aug 17 2023 Mikolaj Izdebski - 4.8.0-1 +- Update to upstream version 4.8.0 + +* 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 + +* Fri Jan 20 2023 Fedora Release Engineering - 4.2.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 4.2.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Apr 24 2022 Mikolaj Izdebski - 4.2.7-1 +- Update to upstream version 4.2.7 + +* Sat Feb 05 2022 Jiri Vanek - 4.2.4-5 +- Rebuilt for java-17-openjdk as system jdk + +* Fri Jan 21 2022 Fedora Release Engineering - 4.2.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jul 27 2021 Fedora Release Engineering - 4.2.4-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 4.2.4-2 +- Bootstrap build +- Non-bootstrap build + +* Fri Feb 12 2021 Marian Koncek - 4.2.4-1 +- Update to upstream version 4.2.4 + +* Sat Jan 30 2021 Fabio Valentini - 0:4.2.4-1 +- Update to version 4.2.4. + +* Wed Jan 27 2021 Fedora Release Engineering - 0:4.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Dec 4 2020 Mikolaj Izdebski - 4.2.3-1 +- Update to upstream version 4.2.3 + +* Sat Oct 24 2020 Fabio Valentini - 0:4.2.3-1 +- Update to version 4.2.3. + +* Mon Aug 03 2020 Marian Koncek - 4.2.2-1 +- Update to upstream version 4.2.2 + +* Tue Jul 28 2020 Fedora Release Engineering - 0:4.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 0:4.2.2-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Mar 02 2020 Fabio Valentini - 0:4.2.2-1 +- Update to version 4.2.2. + +* Thu Jan 30 2020 Fedora Release Engineering - 0:4.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Nov 20 2019 Marian Koncek - 4.2.1-1 +- Update to upstream version 4.2.1 + * Tue Nov 05 2019 Mikolaj Izdebski - 4.2.0-2 - Mass rebuild for javapackages-tools 201902 +* Mon Oct 28 2019 Fabio Valentini - 0:4.2.1-1 +- Update to version 4.2.1. + +* Thu Oct 24 2019 Fabio Valentini - 0:4.2.0-1 +- Update to version 4.2.0. + * Wed Oct 23 2019 Marian Koncek - 4.2.0-1 - Update to upstream version 4.2.0 +* Wed Aug 07 2019 Marian Koncek - 0:4.1.0-1 +- Update to upstream version 4.1.0 + +* Fri Jul 26 2019 Fedora Release Engineering - 0:3.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 4.1.0-2 - Mass rebuild for javapackages-tools 201901 * Wed Feb 27 2019 Marian Koncek - 0:4.1.0-1 - Update to upstream version 4.1.0 +* Sat Feb 02 2019 Fedora Release Engineering - 0:3.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0:3.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed May 09 2018 Michael Simacek - 0:3.6.0-1 - Update to upstream version 3.6.0