4.11.0

2026-02-06 14:37:50 +01:00
7 changed files with 52 additions and 80 deletions
--- a/0001-Remove-support-for-snappy.patch
+++ b/0001-Remove-support-for-snappy.patch
@@ -1,55 +0,0 @@
-From 35a4229c8b659a92591892014a7def330e4e9a1a 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
-
---
- .../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 6c3eb116..b9c47225 100644
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
-+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
-@@ -24,7 +24,6 @@
- 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;
-@@ -425,7 +424,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 support 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 8ff360de..270bf954 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 support snappy compression" );
-         } else if (compression == UntarCompressionMethod.XZ) {
-             return new XZCompressorInputStream(istream);
-         } else if (compression == UntarCompressionMethod.ZSTD) {
-- 
-2.51.0
-
--- a/0001-Remove-support-for-zstd.patch
+++ b/0001-Remove-support-for-zstd.patch
@@ -1,7 +1,7 @@
-From f703c72614a8d78af30152f83004ac74ec8aadae Mon Sep 17 00:00:00 2001
+From c2472e893d0a438fd5cef7d9eae98ccea1bf2d60 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
 Date: Thu, 13 Jun 2024 09:02:59 +0200
-Subject: [PATCH 2/2] Remove support for zstd
+Subject: [PATCH] Remove support for zstd

 ---
 .../java/org/codehaus/plexus/archiver/tar/TarArchiver.java     | 3 +--
@@ -9,12 +9,12 @@ Subject: [PATCH 2/2] Remove support for zstd
 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 070849c1..c0f10c60 100644
+index 2091eaf8..78c469ef 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.snappy.FramedSnappyCompressorOutputStream;
 import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
 -import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
 import org.codehaus.plexus.archiver.AbstractArchiver;
@@ -30,18 +30,18 @@ index 070849c1..c0f10c60 100644
 
         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 0ae6e3b4..8fa6e925 100644
+index de73c106..173e4c22 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;
+@@ -28,7 +28,6 @@
 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;
-@@ -140,7 +139,7 @@ private InputStream decompress(UntarCompressionMethod compression, final File fi
+@@ -141,7 +140,7 @@ private InputStream decompress(UntarCompressionMethod compression, final File fi
         } else if (compression == UntarCompressionMethod.XZ) {
             return new XZCompressorInputStream(istream);
         } else if (compression == UntarCompressionMethod.ZSTD) {
@@ -51,5 +51,5 @@ index 0ae6e3b4..8fa6e925 100644
         return istream;
     }
 -- 
-2.45.2
+2.52.0

--- a/plexus-archiver-4.10.2.tar.gz
+++ b/plexus-archiver-4.10.2.tar.gz
--- a/plexus-archiver-4.11.0.tar.gz
+++ b/plexus-archiver-4.11.0.tar.gz
--- a/plexus-archiver-build.xml
+++ b/plexus-archiver-build.xml
@@ -10,7 +10,7 @@

  <property name="project.groupId" value="org.codehaus.plexus"/>
  <property name="project.artifactId" value="plexus-archiver"/>
-  <property name="project.version" value="4.10.2"/>
+  <property name="project.version" value="4.11.0"/>

  <property name="compiler.release" value="8"/>
  <property name="compiler.source" value="1.${compiler.release}"/>
--- a/plexus-archiver.changes
+++ b/plexus-archiver.changes
@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Fri Feb  6 13:27:13 UTC 2026 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 4.11.0
+  * New features and improvements
+    + Replace PlexusIoZipFileResourceCollection with
+      PlexusArchiverZipFileResourceCollection for non-JAR formats
+  * Bug Fixes
+    + Revert "Utilize VT if possible
+    + Fix AbstractZipUnArchiver handling of zip entries with
+      unspecified modification time
+    + Fix AbstractArchiver.getFiles() to return forward slashes for
+      ZIP-based archivers
+    + Reduce heap usage in Zip archiver to prevent OutOfMemoryError
+      in CI builds
+  * Maintenance
+    + Convert to Markdown and compare to Commons Compress
+    + JUnit Jupiter best practices
+    + Replace FileUtils.deleteDirectory(File) with JDK provided API
+  * Dependency updates
+    + Downgrade plexus-utils to 3.6.0
+    + Bump com.github.luben:zstd-jni from 1.5.7-4 to 1.5.7-6
+    + Bump plexus-io to 3.6.0
+    + Bump org.codehaus.plexus:plexus from 23 to 25
+    + Replace Airlift Snappy with Apache Commons Compress
+    + Removal of dependency to AirCompressor that contains
+      vulnerabilities
+    + Bump org.tukaani:xz from 1.10 to 1.11
+- Modified patch:
+  * 0002-Remove-support-for-zstd.patch
+    -> 0001-Remove-support-for-zstd.patch
+    + rediff
+- Removed patch:
+  * 0001-Remove-support-for-snappy.patch
+    + snappy support goes now through commons-io that we package
+
 -------------------------------------------------------------------
 Tue Oct  7 11:25:23 UTC 2025 - Fridrich Strba <fstrba@suse.com>

--- a/plexus-archiver.spec
+++ b/plexus-archiver.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-archiver
 #
-# Copyright (c) 2025 SUSE LLC and contributors
+# Copyright (c) 2026 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@


 Name:           plexus-archiver
-Version:        4.10.2
+Version:        4.11.0
 Release:        0
 Summary:        Plexus Archiver Component
 License:        Apache-2.0
@@ -25,8 +25,7 @@ Group:          Development/Libraries/Java
 URL:            https://codehaus-plexus.github.io/plexus-archiver
 Source0:        https://github.com/codehaus-plexus/plexus-archiver/archive/plexus-archiver-%{version}.tar.gz
 Source1:        %{name}-build.xml
-Patch0:         0001-Remove-support-for-snappy.patch
-Patch1:         0002-Remove-support-for-zstd.patch
+Patch0:         0001-Remove-support-for-zstd.patch
 Patch2:         y2038.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-compress
@@ -62,14 +61,6 @@ Javadoc for %{name}.
 cp %{SOURCE1} build.xml

 %patch -P 0 -p1
-%pom_remove_dep io.airlift:aircompressor
-rm -rf src/main/java/org/codehaus/plexus/archiver/snappy
-rm -rf src/test/java/org/codehaus/plexus/archiver/snappy
-rm -f src/main/java/org/codehaus/plexus/archiver/tar/SnappyTarFile.java
-rm -f src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResourceCollection.java
-rm -r src/test/java/org/codehaus/plexus/archiver/tar/TarSnappyUnArchiverTest.java
-
-%patch -P 1 -p1
 %pom_remove_dep com.github.luben:zstd-jni
 rm -rf src/main/java/org/codehaus/plexus/archiver/zstd
 rm -rf src/test/java/org/codehaus/plexus/archiver/zstd