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