From ff2befd2e930a88362d498e74184f7821592dd2d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Aug 2023 19:55:04 +0200 Subject: [PATCH] Update to upstream version 4.8.0 --- .gitignore | 1 + 0001-Remove-support-for-snappy.patch | 55 ++++++++++++++-------------- 0002-Remove-support-for-zstd.patch | 41 +++++++++++---------- plexus-archiver.spec | 19 ++++++---- sources | 2 +- 5 files changed, 63 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index c566692..110525a 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /plexus-archiver-4.2.4.tar.gz /plexus-archiver-4.2.7.tar.gz /plexus-archiver-4.7.1.tar.gz +/plexus-archiver-4.8.0.tar.gz diff --git a/0001-Remove-support-for-snappy.patch b/0001-Remove-support-for-snappy.patch index eed1d7f..51a4632 100644 --- a/0001-Remove-support-for-snappy.patch +++ b/0001-Remove-support-for-snappy.patch @@ -1,55 +1,56 @@ -From b9a95a75b6ae83230866787d5b659382457c8ce0 Mon Sep 17 00:00:00 2001 +From b69df21577ded31859da039434bab79cb7c5b5e6 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 +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 f63e0e5..5aedfc9 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 -@@ -44,7 +44,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; - /** - * @author Emmanuel Venisse -@@ -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 support snappy compression" ); - } - else if ( TarCompressionMethod.xz.equals( tarCompressionMethod ) ) - { + import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream; + +@@ -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 SnappyOutputStream(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 d88c3dd..ddb7b12 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 -@@ -35,7 +35,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.iq80.snappy.SnappyFramedInputStream; - /** - * @author Emmanuel Venisse -@@ -154,7 +153,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 ) - } - else if ( compression == UntarCompressionMethod.SNAPPY ) - { -- return new SnappyFramedInputStream( istream, true ); -+ throw new UnsupportedOperationException( "This version of plexus-archiver does not support snappy compression" ); - } - else if ( compression == UntarCompressionMethod.XZ ) - { + import static org.codehaus.plexus.archiver.util.Streams.bufferedInputStream; + import static org.codehaus.plexus.archiver.util.Streams.fileInputStream; +@@ -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.41.0 diff --git a/0002-Remove-support-for-zstd.patch b/0002-Remove-support-for-zstd.patch index 1e4d7aa..539b94f 100644 --- a/0002-Remove-support-for-zstd.patch +++ b/0002-Remove-support-for-zstd.patch @@ -1,18 +1,19 @@ -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 +From 01dc5709a908158ca5f59e4312df772f81d2fef8 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] 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 5aedfc9..87355e6 100644 +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 -@@ -31,7 +31,6 @@ +@@ -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; @@ -20,20 +21,20 @@ index 5aedfc9..87355e6 100644 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" ); +@@ -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 ddb7b12..d27f377 100644 +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 -@@ -30,7 +30,6 @@ +@@ -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; @@ -41,12 +42,12 @@ index ddb7b12..d27f377 100644 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" ); +@@ -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; } diff --git a/plexus-archiver.spec b/plexus-archiver.spec index 00647b6..1064941 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: plexus-archiver -Version: 4.7.1 +Version: 4.8.0 Release: 1%{?dist} Summary: Plexus Archiver Component License: Apache-2.0 @@ -19,19 +19,20 @@ 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-engine) 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 @@ -68,6 +69,7 @@ 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 @@ -86,6 +88,9 @@ rm src/test/java/org/codehaus/plexus/archiver/manager/ArchiverManagerTest.java %license LICENSE %changelog +* 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 diff --git a/sources b/sources index dbab174..065f5d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plexus-archiver-4.7.1.tar.gz) = 0499561fa38e968601f4fb80493edb9b43d5e570c27bdc7e304cc380f68f7cec1a392dc8858b0a1eba9db71eccc6f3ac25f87b8411cc7779970cfa6dd5d9e11a +SHA512 (plexus-archiver-4.8.0.tar.gz) = 0b7a9e013e801b817a9e7ca7601e69ba0972ab7e735eb768872438cabb4e1e552dd33177183ee5db6f3ff0ab703f5024de29a7b225eb19e9277ee9456b3629fb