Accepting request 1201913 from Java:packages

4.10.0

OBS-URL: https://build.opensuse.org/request/show/1201913
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-archiver?expand=0&rev=8

0001-Remove-support-for-snappy.patch

@@ -1,4 +1,4 @@
-From e922d103d4ca5efb889654c5573d0deec6161b94 Mon Sep 17 00:00:00 2001
+From dc47e7ca10fded81f327cd304c8235e9598509b5 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
@@ -9,38 +9,38 @@ Subject: [PATCH 1/2] Remove support for snappy
  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 cae07804..070849c1 100644
+index ba53a1b9..070849c1 100644
 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
 +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
-@@ -42,7 +42,6 @@
+@@ -25,7 +25,6 @@
- import org.codehaus.plexus.components.io.resources.PlexusIoResource;
+ import java.nio.file.Files;
- import org.codehaus.plexus.util.IOUtil;
+ import java.util.zip.GZIPOutputStream;
- import org.codehaus.plexus.util.StringUtils;
--import org.iq80.snappy.SnappyOutputStream;
- 
- import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
  
+-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 SnappyOutputStream(bufferedOutputStream(ostream));
+-            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 1b0b7950..0ae6e3b4 100644
+index 507cb6cb..0ae6e3b4 100644
 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
 +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
-@@ -32,7 +32,6 @@
+@@ -23,7 +23,6 @@
- import org.codehaus.plexus.archiver.ArchiverException;
+ import java.io.InputStream;
- import org.codehaus.plexus.archiver.util.Streams;
+ import java.util.zip.GZIPInputStream;
- import org.codehaus.plexus.components.io.filemappers.FileMapper;
--import org.iq80.snappy.SnappyFramedInputStream;
  
- import static org.codehaus.plexus.archiver.util.Streams.bufferedInputStream;
+-import io.airlift.compress.snappy.SnappyFramedInputStream;
- import static org.codehaus.plexus.archiver.util.Streams.fileInputStream;
+ 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);
@@ -51,5 +51,5 @@ index 1b0b7950..0ae6e3b4 100644
              return new XZCompressorInputStream(istream);
          } else if (compression == UntarCompressionMethod.ZSTD) {
 -- 
-2.45.2
+2.46.0
 

plexus-archiver-4.10.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b9611281dfb4e0fae306cbc46ef50a6eac104160d15e335eeec53e5a5567f3d
+size 312424

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.9.2"/>
+  <property name="project.version" value="4.10.0"/>
 
   <property name="compiler.release" value="8"/>
   <property name="compiler.source" value="1.${compiler.release}"/>

plexus-archiver.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Sep 19 05:40:53 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstrem version 4.10.0
+  * New features and improvements
+    + Change Snappy compressor to io.airlift:aircompressor
+    + Fix modular jar final permissions
+- Modified patch:
+  * 0001-Remove-support-for-snappy.patch
+    + rediff to changed context
+
 -------------------------------------------------------------------
 Thu Jun 13 16:12:11 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

plexus-archiver.spec

@@ -17,7 +17,7 @@
 
 
 Name:           plexus-archiver
-Version:        4.9.2
+Version:        4.10.0
 Release:        0
 Summary:        Plexus Archiver Component
 License:        Apache-2.0
@@ -60,7 +60,7 @@ Javadoc for %{name}.
 cp %{SOURCE1} build.xml
 
 %patch -P 0 -p1
-%pom_remove_dep org.iq80.snappy:snappy
+%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