public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jacek Migacz <jmigacz@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/plexus-archiver] rawhide: Update to upstream version 4.12.0
Date: Tue, 04 Aug 2026 08:33:54 GMT [thread overview]
Message-ID: <178583243450.1.9061017868350322636.rpms-plexus-archiver-eae6ec423f3a@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/plexus-archiver
Branch : rawhide
Commit : eae6ec423f3aceced20ac46f8a0bba35642277c4
Author : Jacek Migacz <jmigacz@redhat.com>
Date : 2026-08-04T08:33:32+00:00
Stats : +106/-117 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/plexus-archiver/c/eae6ec423f3aceced20ac46f8a0bba35642277c4?branch=rawhide
Log:
Update to upstream version 4.12.0
---
diff --git a/.gitignore b/.gitignore
index 7863367..0d62aac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@
/plexus-archiver-4.9.0.tar.gz
/plexus-archiver-4.9.1.tar.gz
/plexus-archiver-4.10.0.tar.gz
+/plexus-archiver-4.12.0.tar.gz
diff --git a/0001-Remove-support-for-snappy-and-zstd.patch b/0001-Remove-support-for-snappy-and-zstd.patch
new file mode 100644
index 0000000..40fb3f1
--- /dev/null
+++ b/0001-Remove-support-for-snappy-and-zstd.patch
@@ -0,0 +1,96 @@
+From 6269fe0296a721be4f581707f139c6d633ccd725 Mon Sep 17 00:00:00 2001
+From: Jacek Migacz <jmigacz@redhat.com>
+Date: Wed, 24 Jun 2026 16:40:01 +0000
+Subject: [PATCH] Remove support for snappy
+
+---
+ .../org/codehaus/plexus/archiver/tar/TarArchiver.java | 8 --------
+ .../org/codehaus/plexus/archiver/tar/TarUnArchiver.java | 9 ---------
+ 2 files changed, 17 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 2091eaf..b6ad1da 100644
+--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
++++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
+@@ -27,9 +27,7 @@
+ 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;
+ import org.codehaus.plexus.archiver.ArchiveEntry;
+ import org.codehaus.plexus.archiver.ArchiverException;
+@@ -413,9 +411,7 @@ public enum TarCompressionMethod {
+ none,
+ gzip,
+ bzip2,
+- snappy,
+ xz,
+- zstd
+ }
+
+ private OutputStream compress(TarCompressionMethod tarCompressionMethod, final OutputStream ostream)
+@@ -424,12 +420,8 @@ private OutputStream compress(TarCompressionMethod tarCompressionMethod, final O
+ return bufferedOutputStream(new GZIPOutputStream(ostream));
+ } else if (TarCompressionMethod.bzip2.equals(tarCompressionMethod)) {
+ return new BZip2CompressorOutputStream(bufferedOutputStream(ostream));
+- } else if (TarCompressionMethod.snappy.equals(tarCompressionMethod)) {
+- return new FramedSnappyCompressorOutputStream(bufferedOutputStream(ostream));
+ } else if (TarCompressionMethod.xz.equals(tarCompressionMethod)) {
+ return new XZCompressorOutputStream(bufferedOutputStream(ostream));
+- } else if (TarCompressionMethod.zstd.equals(tarCompressionMethod)) {
+- return new ZstdCompressorOutputStream(bufferedOutputStream(ostream));
+ }
+
+ return ostream;
+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 de73c10..51a1e5b 100644
+--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
++++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
+@@ -26,9 +26,7 @@
+ 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;
+ import org.codehaus.plexus.archiver.ArchiverException;
+ import org.codehaus.plexus.archiver.util.Streams;
+@@ -62,7 +60,6 @@ public TarUnArchiver(File sourceFile) {
+ * <li>none - no compression</li>
+ * <li>gzip - Gzip compression</li>
+ * <li>bzip2 - Bzip2 compression</li>
+- * <li>snappy - Snappy compression</li>
+ * <li>xz - Xz compression</li>
+ * </ul>
+ *
+@@ -136,12 +133,8 @@ private InputStream decompress(UntarCompressionMethod compression, final File fi
+ return Streams.bufferedInputStream(new GZIPInputStream(istream));
+ } else if (compression == UntarCompressionMethod.BZIP2) {
+ return new BZip2CompressorInputStream(istream);
+- } else if (compression == UntarCompressionMethod.SNAPPY) {
+- return new FramedSnappyCompressorInputStream(istream);
+ } else if (compression == UntarCompressionMethod.XZ) {
+ return new XZCompressorInputStream(istream);
+- } else if (compression == UntarCompressionMethod.ZSTD) {
+- return new ZstdCompressorInputStream(istream);
+ }
+ return istream;
+ }
+@@ -153,9 +146,7 @@ public enum UntarCompressionMethod {
+ NONE("none"),
+ GZIP("gzip"),
+ BZIP2("bzip2"),
+- SNAPPY("snappy"),
+- XZ("xz"),
+- ZSTD("zstd");
++ XZ("xz");
+
+ final String value;
+
+--
+2.54.0
+
diff --git a/0001-Remove-support-for-snappy.patch b/0001-Remove-support-for-snappy.patch
deleted file mode 100644
index be7547e..0000000
--- a/0001-Remove-support-for-snappy.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 5f3ef9f786db6adc09b491ff049880744076a203 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
-
-Forwarded: not-needed
----
- .../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..7fc30ba1 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 upport 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..52cae0c9 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 upport snappy compression");
- } else if (compression == UntarCompressionMethod.XZ) {
- return new XZCompressorInputStream(istream);
- } else if (compression == UntarCompressionMethod.ZSTD) {
---
-2.46.0
-
diff --git a/0002-Remove-support-for-zstd.patch b/0002-Remove-support-for-zstd.patch
deleted file mode 100644
index b350aea..0000000
--- a/0002-Remove-support-for-zstd.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ff7178ca8f0728a2bc6d5d12d74e9c47de2c37a8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mari=C3=A1n=20Kon=C4=8Dek?= <marian.koncek@mailbox.org>
-Date: Fri, 11 Aug 2023 14:04:26 +0200
-Subject: [PATCH 2/2] Remove support for zstd
-
-Forwarded: not-needed
----
- .../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 7fc30ba1..68433734 100644
---- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
-+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
-@@ -29,7 +29,6 @@
- import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
- import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
- import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
--import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
- import org.codehaus.plexus.archiver.AbstractArchiver;
- import org.codehaus.plexus.archiver.ArchiveEntry;
- import org.codehaus.plexus.archiver.ArchiverException;
-@@ -429,7 +428,7 @@ private OutputStream compress(TarCompressionMethod tarCompressionMethod, final O
- } else if (TarCompressionMethod.xz.equals(tarCompressionMethod)) {
- return new XZCompressorOutputStream(bufferedOutputStream(ostream));
- } else if (TarCompressionMethod.zstd.equals(tarCompressionMethod)) {
-- return new ZstdCompressorOutputStream(bufferedOutputStream(ostream));
-+ throw new UnsupportedOperationException("This version of plexus-archiver does not upport zstd compression");
- }
-
- return ostream;
-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 52cae0c9..4c0e70c1 100644
---- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
-+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
-@@ -27,7 +27,6 @@
- import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
- import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
- import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
--import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
- import org.codehaus.plexus.archiver.AbstractUnArchiver;
- import org.codehaus.plexus.archiver.ArchiverException;
- import org.codehaus.plexus.archiver.util.Streams;
-@@ -140,7 +139,7 @@ private InputStream decompress(UntarCompressionMethod compression, final File fi
- } else if (compression == UntarCompressionMethod.XZ) {
- return new XZCompressorInputStream(istream);
- } else if (compression == UntarCompressionMethod.ZSTD) {
-- return new ZstdCompressorInputStream(istream);
-+ throw new UnsupportedOperationException("This version of plexus-archiver does not upport zstd compression");
- }
- return istream;
- }
---
-2.46.0
-
diff --git a/plexus-archiver.spec b/plexus-archiver.spec
index 92dbd1e..1c5d1ad 100644
--- a/plexus-archiver.spec
+++ b/plexus-archiver.spec
@@ -1,7 +1,7 @@
%bcond_with bootstrap
Name: plexus-archiver
-Version: 4.10.0
+Version: 4.12.0
Release: %autorelease
Summary: Plexus Archiver Component
License: Apache-2.0
@@ -11,8 +11,7 @@ ExclusiveArch: %{java_arches} noarch
Source0: https://github.com/codehaus-plexus/plexus-archiver/archive/plexus-archiver-%{version}.tar.gz
-Patch: 0001-Remove-support-for-snappy.patch
-Patch: 0002-Remove-support-for-zstd.patch
+Patch: 0001-Remove-support-for-snappy-and-zstd.patch
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
@@ -51,11 +50,12 @@ is like a J2EE application server, without all the baggage.
%mvn_file :%{name} plexus/archiver
-%pom_remove_dep io.airlift:aircompressor
rm -r src/main/java/org/codehaus/plexus/archiver/snappy
rm -r src/test/java/org/codehaus/plexus/archiver/snappy
rm src/main/java/org/codehaus/plexus/archiver/tar/SnappyTarFile.java
rm src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResourceCollection.java
+rm src/main/java/org/codehaus/plexus/archiver/tar/TarSnappyArchiver.java
+rm src/main/java/org/codehaus/plexus/archiver/tar/TarSnappyUnArchiver.java
rm src/test/java/org/codehaus/plexus/archiver/tar/TarSnappyUnArchiverTest.java
%pom_remove_dep com.github.luben:zstd-jni
@@ -64,6 +64,10 @@ rm -r src/test/java/org/codehaus/plexus/archiver/zstd
rm src/main/java/org/codehaus/plexus/archiver/tar/ZstdTarFile.java
rm src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarZstdFileResourceCollection.java
rm src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTZstdFileResourceCollection.java
+rm src/main/java/org/codehaus/plexus/archiver/tar/TarZstdArchiver.java
+rm src/main/java/org/codehaus/plexus/archiver/tar/TarZstdUnArchiver.java
+rm src/main/java/org/codehaus/plexus/archiver/tar/TZstdArchiver.java
+rm src/main/java/org/codehaus/plexus/archiver/tar/TZstdUnArchiver.java
rm src/test/java/org/codehaus/plexus/archiver/tar/TarZstdUnArchiverTest.java
# Fails due to previously removed compressors
diff --git a/sources b/sources
index 4c39a92..627275d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (plexus-archiver-4.10.0.tar.gz) = e452a8093b97b2c6fc75fd81b394e201a8762f38444488a7d6580b6600b9ba202d18f9a4a53417c1336d60ce09030a0aa61bd15320788d90e3f2906774cc8ba6
+SHA512 (plexus-archiver-4.12.0.tar.gz) = 3ca82199c70136cb4c8520ff9bf07ee26e9460e0764a64853fed41e89597d0016a1a707edc059dba0b318a147e468c4a1c259964a1bd5282d20593260760a583
reply other threads:[~2026-08-04 8:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178583243450.1.9061017868350322636.rpms-plexus-archiver-eae6ec423f3a@fedoraproject.org \
--to=jmigacz@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox