[plexus-archiver] 37/44: Use the xerial snappy-java implementation

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository plexus-archiver.

commit e99b88051f69e79740dff1ab32f230b1e299bf6e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 20 14:02:44 2017 +0200

    Use the xerial snappy-java implementation
---
 debian/maven.rules                           |  1 +
 debian/patches/02-snappy-compatibility.patch | 56 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 58 insertions(+)

diff --git a/debian/maven.rules b/debian/maven.rules
index ec1dba7..5f27214 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -2,3 +2,4 @@ junit junit * s/.*/4.x/ * *
 org.codehaus.plexus plexus-container-default jar s/.*/1.0-alpha/
 org.codehaus.plexus plexus-component-metadata maven-plugin s/1.6/1.5.5/ * *
 org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
+s/org.iq80.snappy/org.xerial.snappy/ s/snappy/snappy-java/ * s/.*/debian/ * *
diff --git a/debian/patches/02-snappy-compatibility.patch b/debian/patches/02-snappy-compatibility.patch
new file mode 100644
index 0000000..ebe4196
--- /dev/null
+++ b/debian/patches/02-snappy-compatibility.patch
@@ -0,0 +1,56 @@
+Description: Switch back to the JNI based snappy-java implementation (the pure Java version isn't in Debian yet)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyCompressor.java
++++ b/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyCompressor.java
+@@ -19,7 +19,7 @@
+ import java.io.IOException;
+ import org.codehaus.plexus.archiver.ArchiverException;
+ import org.codehaus.plexus.archiver.util.Compressor;
+-import org.iq80.snappy.SnappyOutputStream;
++import org.xerial.snappy.SnappyOutputStream;
+ import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
+ import static org.codehaus.plexus.archiver.util.Streams.fileOutputStream;
+ 
+--- a/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyUnArchiver.java
++++ b/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyUnArchiver.java
+@@ -22,7 +22,7 @@
+ import javax.annotation.Nonnull;
+ import org.codehaus.plexus.archiver.AbstractUnArchiver;
+ import org.codehaus.plexus.archiver.ArchiverException;
+-import org.iq80.snappy.SnappyInputStream;
++import org.xerial.snappy.SnappyInputStream;
+ import static org.codehaus.plexus.archiver.util.Streams.bufferedInputStream;
+ import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
+ import static org.codehaus.plexus.archiver.util.Streams.copyFully;
+--- 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,7 @@
+ 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 org.xerial.snappy.SnappyOutputStream;
+ import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
+ 
+ /**
+--- 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,7 @@
+ import org.codehaus.plexus.archiver.ArchiverException;
+ import org.codehaus.plexus.archiver.util.Streams;
+ import org.codehaus.plexus.util.IOUtil;
+-import org.iq80.snappy.SnappyInputStream;
++import org.xerial.snappy.SnappyInputStream;
+ 
+ /**
+  * @author <a href="mailto:evenisse at codehaus.org">Emmanuel Venisse</a>
+@@ -153,7 +153,7 @@
+         }
+         else if ( compression == UntarCompressionMethod.SNAPPY )
+         {
+-            return new SnappyInputStream( istream, true );
++            return new SnappyInputStream( istream );
+         }
+         else if ( compression == UntarCompressionMethod.XZ )
+         {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..18c6302
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+02-snappy-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-archiver.git