From 770d8693fdc961c1e9e8d69e66fafab370d69d14 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Fri, 9 Jan 2026 23:27:37 +0100 Subject: [PATCH] Replace Airlift Snappy with Apache Commons Compress --- pom.xml | 6 +++--- .../codehaus/plexus/archiver/snappy/SnappyCompressor.java | 6 +++--- .../codehaus/plexus/archiver/snappy/SnappyUnArchiver.java | 7 ++++--- .../java/org/codehaus/plexus/archiver/tar/TarArchiver.java | 4 ++-- .../org/codehaus/plexus/archiver/tar/TarUnArchiver.java | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 31f9de14..76b8f276 100644 --- a/pom.xml +++ b/pom.xml @@ -79,9 +79,9 @@ ${slf4jVersion} - io.airlift - aircompressor - 0.27 + commons-io + commons-io + 2.21.0 org.tukaani diff --git a/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyCompressor.java b/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyCompressor.java index 5f4b7144..3d955df9 100644 --- a/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyCompressor.java +++ b/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyCompressor.java @@ -18,7 +18,7 @@ import java.io.IOException; -import io.airlift.compress.snappy.SnappyFramedOutputStream; +import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorOutputStream; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.util.Compressor; @@ -30,7 +30,7 @@ */ public class SnappyCompressor extends Compressor { - private SnappyFramedOutputStream zOut; + private FramedSnappyCompressorOutputStream zOut; /** * perform the Snappy compression operation. @@ -38,7 +38,7 @@ public class SnappyCompressor extends Compressor { @Override public void compress() throws ArchiverException { try { - zOut = new SnappyFramedOutputStream(bufferedOutputStream(fileOutputStream(getDestFile()))); + zOut = new FramedSnappyCompressorOutputStream(bufferedOutputStream(fileOutputStream(getDestFile()))); compress(getSource(), zOut); } catch (IOException ioe) { String msg = "Problem creating snappy " + ioe.getMessage(); diff --git a/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyUnArchiver.java index 6405bc20..6ae3e08b 100644 --- a/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyUnArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyUnArchiver.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.io.InputStream; -import io.airlift.compress.snappy.SnappyFramedInputStream; +import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream; import org.codehaus.plexus.archiver.AbstractUnArchiver; import org.codehaus.plexus.archiver.ArchiverException; @@ -61,9 +61,10 @@ protected void execute() throws ArchiverException { } } - public static @Nonnull SnappyFramedInputStream getSnappyInputStream(InputStream bis) throws ArchiverException { + public static @Nonnull FramedSnappyCompressorInputStream getSnappyInputStream(InputStream bis) + throws ArchiverException { try { - return new SnappyFramedInputStream(bis, true); + return new FramedSnappyCompressorInputStream(bis); } catch (IOException e) { throw new ArchiverException("Trouble creating Snappy compressor, invalid file ?", e); } 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 6c3eb116..2091eaf8 100644 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java @@ -24,10 +24,10 @@ import java.io.OutputStream; 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; +import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorOutputStream; import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream; import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream; import org.codehaus.plexus.archiver.AbstractArchiver; @@ -425,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)); + return new FramedSnappyCompressorOutputStream(bufferedOutputStream(ostream)); } 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 8ff360de..de73c106 100644 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java @@ -23,10 +23,10 @@ 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; +import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream; import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream; import org.codehaus.plexus.archiver.AbstractUnArchiver; @@ -137,7 +137,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); + return new FramedSnappyCompressorInputStream(istream); } else if (compression == UntarCompressionMethod.XZ) { return new XZCompressorInputStream(istream); } else if (compression == UntarCompressionMethod.ZSTD) {