|
 |
60b5b80 |
From cec8a488028be8e1bff1fcde35818a5b1babc2b7 Mon Sep 17 00:00:00 2001
|
|
|
60b5b80 |
From: Marian Koncek <mkoncek@redhat.com>
|
|
|
60b5b80 |
Date: Tue, 18 Jul 2023 15:40:59 +0200
|
|
|
60b5b80 |
Subject: [PATCH 2/2] Remove support for zstd
|
|
|
60b5b80 |
|
|
|
60b5b80 |
---
|
|
|
60b5b80 |
.../java/org/codehaus/plexus/archiver/tar/TarArchiver.java | 3 +--
|
|
|
60b5b80 |
.../java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java | 3 +--
|
|
|
60b5b80 |
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
60b5b80 |
|
|
|
60b5b80 |
diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
|
|
|
60b5b80 |
index 5aedfc9..87355e6 100644
|
|
|
60b5b80 |
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
|
|
|
60b5b80 |
+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
|
|
|
60b5b80 |
@@ -31,7 +31,6 @@
|
|
|
60b5b80 |
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
|
|
|
60b5b80 |
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
|
|
|
60b5b80 |
import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
|
|
|
60b5b80 |
-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
|
|
|
60b5b80 |
import org.codehaus.plexus.archiver.AbstractArchiver;
|
|
|
60b5b80 |
import org.codehaus.plexus.archiver.ArchiveEntry;
|
|
|
60b5b80 |
import org.codehaus.plexus.archiver.ArchiverException;
|
|
|
60b5b80 |
@@ -510,7 +509,7 @@ else if ( TarCompressionMethod.xz.equals( tarCompressionMethod ) )
|
|
|
60b5b80 |
}
|
|
|
60b5b80 |
else if ( TarCompressionMethod.zstd.equals( tarCompressionMethod ) )
|
|
|
60b5b80 |
{
|
|
|
60b5b80 |
- return new ZstdCompressorOutputStream( bufferedOutputStream( ostream ) );
|
|
|
60b5b80 |
+ throw new UnsupportedOperationException( "This version of plexus-archiver does not support zstd compression" );
|
|
|
60b5b80 |
}
|
|
|
60b5b80 |
|
|
|
60b5b80 |
return ostream;
|
|
|
60b5b80 |
diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
|
|
|
60b5b80 |
index ddb7b12..d27f377 100644
|
|
|
60b5b80 |
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
|
|
|
60b5b80 |
+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
|
|
|
60b5b80 |
@@ -30,7 +30,6 @@
|
|
|
60b5b80 |
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
|
|
|
60b5b80 |
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
|
|
|
60b5b80 |
import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
|
|
|
60b5b80 |
-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
|
|
|
60b5b80 |
import org.codehaus.plexus.archiver.AbstractUnArchiver;
|
|
|
60b5b80 |
import org.codehaus.plexus.archiver.ArchiverException;
|
|
|
60b5b80 |
import org.codehaus.plexus.archiver.util.Streams;
|
|
|
60b5b80 |
@@ -161,7 +160,7 @@ else if ( compression == UntarCompressionMethod.XZ )
|
|
|
60b5b80 |
}
|
|
|
60b5b80 |
else if ( compression == UntarCompressionMethod.ZSTD )
|
|
|
60b5b80 |
{
|
|
|
60b5b80 |
- return new ZstdCompressorInputStream( istream );
|
|
|
60b5b80 |
+ throw new UnsupportedOperationException( "This version of plexus-archiver does not support zstd compression" );
|
|
|
60b5b80 |
}
|
|
|
60b5b80 |
return istream;
|
|
|
60b5b80 |
}
|
|
|
60b5b80 |
--
|
|
|
60b5b80 |
2.41.0
|
|
|
60b5b80 |
|