forked from pool/plexus-archiver
56 lines
3.2 KiB
Diff
56 lines
3.2 KiB
Diff
From dc47e7ca10fded81f327cd304c8235e9598509b5 Mon Sep 17 00:00:00 2001
|
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
Date: Sat, 23 Sep 2017 11:43:45 +0200
|
|
Subject: [PATCH 1/2] Remove support for snappy
|
|
|
|
---
|
|
.../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 ba53a1b9..070849c1 100644
|
|
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
|
|
+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
|
|
@@ -25,7 +25,6 @@
|
|
import java.nio.file.Files;
|
|
import java.util.zip.GZIPOutputStream;
|
|
|
|
-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 support 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 507cb6cb..0ae6e3b4 100644
|
|
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
|
|
+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
|
|
@@ -23,7 +23,6 @@
|
|
import java.io.InputStream;
|
|
import java.util.zip.GZIPInputStream;
|
|
|
|
-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 support snappy compression" );
|
|
} else if (compression == UntarCompressionMethod.XZ) {
|
|
return new XZCompressorInputStream(istream);
|
|
} else if (compression == UntarCompressionMethod.ZSTD) {
|
|
--
|
|
2.46.0
|
|
|