|
 |
ff2befd |
From b69df21577ded31859da039434bab79cb7c5b5e6 Mon Sep 17 00:00:00 2001
|
|
|
43a552a |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
43a552a |
Date: Sat, 23 Sep 2017 11:43:45 +0200
|
|
|
43a552a |
Subject: [PATCH] Remove support for snappy
|
|
|
43a552a |
|
|
|
ff2befd |
Forwarded: not-needed
|
|
|
43a552a |
---
|
|
|
2c67123 |
.../java/org/codehaus/plexus/archiver/tar/TarArchiver.java | 3 +--
|
|
|
2c67123 |
.../java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java | 3 +--
|
|
|
43a552a |
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
43a552a |
|
|
|
43a552a |
diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
|
|
|
ff2befd |
index cae07804..7fc30ba1 100644
|
|
|
43a552a |
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
|
|
|
43a552a |
+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
|
|
|
ff2befd |
@@ -42,7 +42,6 @@
|
|
|
43a552a |
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
|
|
|
43a552a |
import org.codehaus.plexus.util.IOUtil;
|
|
|
43a552a |
import org.codehaus.plexus.util.StringUtils;
|
|
|
43a552a |
-import org.iq80.snappy.SnappyOutputStream;
|
|
|
43a552a |
|
|
|
ff2befd |
import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
|
|
|
ff2befd |
|
|
|
ff2befd |
@@ -426,7 +425,7 @@ private OutputStream compress(TarCompressionMethod tarCompressionMethod, final O
|
|
|
ff2befd |
} else if (TarCompressionMethod.bzip2.equals(tarCompressionMethod)) {
|
|
|
ff2befd |
return new BZip2CompressorOutputStream(bufferedOutputStream(ostream));
|
|
|
ff2befd |
} else if (TarCompressionMethod.snappy.equals(tarCompressionMethod)) {
|
|
|
ff2befd |
- return new SnappyOutputStream(bufferedOutputStream(ostream));
|
|
|
ff2befd |
+ throw new UnsupportedOperationException("This version of plexus-archiver does not upport snappy compression");
|
|
|
ff2befd |
} else if (TarCompressionMethod.xz.equals(tarCompressionMethod)) {
|
|
|
ff2befd |
return new XZCompressorOutputStream(bufferedOutputStream(ostream));
|
|
|
ff2befd |
} else if (TarCompressionMethod.zstd.equals(tarCompressionMethod)) {
|
|
|
43a552a |
diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
|
|
|
ff2befd |
index 1b0b7950..52cae0c9 100644
|
|
|
43a552a |
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
|
|
|
43a552a |
+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
|
|
|
ff2befd |
@@ -32,7 +32,6 @@
|
|
|
e9f4abf |
import org.codehaus.plexus.archiver.ArchiverException;
|
|
|
43a552a |
import org.codehaus.plexus.archiver.util.Streams;
|
|
|
2c67123 |
import org.codehaus.plexus.components.io.filemappers.FileMapper;
|
|
 |
60b5b80 |
-import org.iq80.snappy.SnappyFramedInputStream;
|
|
|
43a552a |
|
|
|
ff2befd |
import static org.codehaus.plexus.archiver.util.Streams.bufferedInputStream;
|
|
|
ff2befd |
import static org.codehaus.plexus.archiver.util.Streams.fileInputStream;
|
|
|
ff2befd |
@@ -137,7 +136,7 @@ private InputStream decompress(UntarCompressionMethod compression, final File fi
|
|
|
ff2befd |
} else if (compression == UntarCompressionMethod.BZIP2) {
|
|
|
ff2befd |
return new BZip2CompressorInputStream(istream);
|
|
|
ff2befd |
} else if (compression == UntarCompressionMethod.SNAPPY) {
|
|
|
ff2befd |
- return new SnappyFramedInputStream(istream, true);
|
|
|
ff2befd |
+ throw new UnsupportedOperationException("This version of plexus-archiver does not upport snappy compression");
|
|
|
ff2befd |
} else if (compression == UntarCompressionMethod.XZ) {
|
|
|
ff2befd |
return new XZCompressorInputStream(istream);
|
|
|
ff2befd |
} else if (compression == UntarCompressionMethod.ZSTD) {
|
|
|
43a552a |
--
|
|
|
60b5b80 |
2.41.0
|
|
|
43a552a |
|