You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
2.5 KiB
56 lines
2.5 KiB
2 years ago
|
From 6e2004d90deab2f59af01629187006e320444e34 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||
|
|
Date: Sat, 23 Sep 2017 11:43:45 +0200
|
||
|
|
Subject: [PATCH] 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 8eec881..be8e7a3 100644
|
||
|
|
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
|
||
|
|
+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
|
||
|
|
@@ -38,7 +38,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;
|
||
|
|
import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
|
||
|
|
|
||
|
|
/**
|
||
|
|
@@ -489,7 +488,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 upport snappy compression" );
|
||
|
|
}
|
||
|
|
else if ( TarCompressionMethod.xz.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 2316d4e..c2e2b83 100644
|
||
|
|
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
|
||
|
|
+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
|
||
|
|
@@ -31,7 +31,6 @@
|
||
|
|
import org.codehaus.plexus.archiver.util.Streams;
|
||
|
|
import org.codehaus.plexus.components.io.filemappers.FileMapper;
|
||
|
|
import org.codehaus.plexus.util.IOUtil;
|
||
|
|
-import org.iq80.snappy.SnappyInputStream;
|
||
|
|
|
||
|
|
/**
|
||
|
|
* @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
|
||
|
|
@@ -154,7 +153,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 )
|
||
|
|
}
|
||
|
|
else if ( compression == UntarCompressionMethod.SNAPPY )
|
||
|
|
{
|
||
|
|
- return new SnappyInputStream( istream, true );
|
||
|
|
+ throw new UnsupportedOperationException( "This version of plexus-archiver does not upport snappy compression" );
|
||
|
|
}
|
||
|
|
else if ( compression == UntarCompressionMethod.XZ )
|
||
|
|
{
|
||
|
|
--
|
||
|
|
2.21.0
|
||
|
|
|