SLFO-pool/plexus-archiver
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main plexus-archiver revision 3592560e1a688e2c78ac7fddf9cc0515

Browse Source
This commit is contained in:
Adrian Schröter 2024-07-01 14:23:47 +02:00
parent 85f2a587a1
commit 9eb04ecd68
7 changed files with 57 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
0001-Remove-support-for-snappy.patch
View File

@ -1,15 +1,15 @@
From bd1055a190a1a64374f4aeb3bfde138d9c3d965f Mon Sep 17 00:00:00 2001 From e922d103d4ca5efb889654c5573d0deec6161b94 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com> From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sat, 23 Sep 2017 11:43:45 +0200 Date: Sat, 23 Sep 2017 11:43:45 +0200
Subject: [PATCH] Remove support for snappy Subject: [PATCH 1/2] Remove support for snappy
--- ---
src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java | 3 +-- .../java/org/codehaus/plexus/archiver/tar/TarArchiver.java | 3 +--
src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java | 3 +-- .../java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-) 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 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 398ecf1..0d46cfc 100644 index cae07804..070849c1 100644
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
+++ b/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 @@ @@ -42,7 +42,6 @@
@ -20,7 +20,7 @@ index 398ecf1..0d46cfc 100644
import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream; import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
@@ -426,7 +425,7 @@ else if ( TarCompressionMethod.bzip2.equals( tarCompressionMethod ) ) @@ -426,7 +425,7 @@ private OutputStream compress(TarCompressionMethod tarCompressionMethod, final O
} else if (TarCompressionMethod.bzip2.equals(tarCompressionMethod)) { } else if (TarCompressionMethod.bzip2.equals(tarCompressionMethod)) {
return new BZip2CompressorOutputStream(bufferedOutputStream(ostream)); return new BZip2CompressorOutputStream(bufferedOutputStream(ostream));
} else if (TarCompressionMethod.snappy.equals(tarCompressionMethod)) { } else if (TarCompressionMethod.snappy.equals(tarCompressionMethod)) {
@ -30,7 +30,7 @@ index 398ecf1..0d46cfc 100644
return new XZCompressorOutputStream(bufferedOutputStream(ostream)); return new XZCompressorOutputStream(bufferedOutputStream(ostream));
} else if (TarCompressionMethod.zstd.equals(tarCompressionMethod)) { } 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 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 4bc94a4..15f0494 100644 index 1b0b7950..0ae6e3b4 100644
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
+++ b/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 @@ @@ -32,7 +32,6 @@
@ -41,7 +41,7 @@ index 4bc94a4..15f0494 100644
import static org.codehaus.plexus.archiver.util.Streams.bufferedInputStream; import static org.codehaus.plexus.archiver.util.Streams.bufferedInputStream;
import static org.codehaus.plexus.archiver.util.Streams.fileInputStream; import static org.codehaus.plexus.archiver.util.Streams.fileInputStream;
@@ -137,7 +136,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 ) @@ -137,7 +136,7 @@ private InputStream decompress(UntarCompressionMethod compression, final File fi
} else if (compression == UntarCompressionMethod.BZIP2) { } else if (compression == UntarCompressionMethod.BZIP2) {
return new BZip2CompressorInputStream(istream); return new BZip2CompressorInputStream(istream);
} else if (compression == UntarCompressionMethod.SNAPPY) { } else if (compression == UntarCompressionMethod.SNAPPY) {
@ -51,5 +51,5 @@ index 4bc94a4..15f0494 100644
return new XZCompressorInputStream(istream); return new XZCompressorInputStream(istream);
} else if (compression == UntarCompressionMethod.ZSTD) { } else if (compression == UntarCompressionMethod.ZSTD) {
-- --
2.13.5 2.45.2

31
plexus-archiver-4.8.0-no_zstd.patch → 0002-Remove-support-for-zstd.patch
View File

@ -1,6 +1,17 @@
diff -urEbwB plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java plexus-archiver-4.8.0/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java From f703c72614a8d78af30152f83004ac74ec8aadae Mon Sep 17 00:00:00 2001
--- plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java 2023-09-04 18:07:46.209959586 +0200 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
+++ plexus-archiver-4.8.0/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java 2023-09-04 18:14:27.122780479 +0200 Date: Thu, 13 Jun 2024 09:02:59 +0200
Subject: [PATCH 2/2] Remove support for zstd
---
.../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 070849c1..c0f10c60 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 @@ @@ -29,7 +29,6 @@
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
@ -9,7 +20,7 @@ diff -urEbwB plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiv
import org.codehaus.plexus.archiver.AbstractArchiver; import org.codehaus.plexus.archiver.AbstractArchiver;
import org.codehaus.plexus.archiver.ArchiveEntry; import org.codehaus.plexus.archiver.ArchiveEntry;
import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.ArchiverException;
@@ -429,7 +428,7 @@ @@ -429,7 +428,7 @@ private OutputStream compress(TarCompressionMethod tarCompressionMethod, final O
} else if (TarCompressionMethod.xz.equals(tarCompressionMethod)) { } else if (TarCompressionMethod.xz.equals(tarCompressionMethod)) {
return new XZCompressorOutputStream(bufferedOutputStream(ostream)); return new XZCompressorOutputStream(bufferedOutputStream(ostream));
} else if (TarCompressionMethod.zstd.equals(tarCompressionMethod)) { } else if (TarCompressionMethod.zstd.equals(tarCompressionMethod)) {
@ -18,9 +29,10 @@ diff -urEbwB plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiv
} }
return ostream; return ostream;
diff -urEbwB plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java plexus-archiver-4.8.0/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
--- plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java 2023-09-04 18:07:46.209959586 +0200 index 0ae6e3b4..8fa6e925 100644
+++ plexus-archiver-4.8.0/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java 2023-09-04 18:13:50.092519851 +0200 --- 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 @@ @@ -27,7 +27,6 @@
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
@ -29,7 +41,7 @@ diff -urEbwB plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiv
import org.codehaus.plexus.archiver.AbstractUnArchiver; import org.codehaus.plexus.archiver.AbstractUnArchiver;
import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.util.Streams; import org.codehaus.plexus.archiver.util.Streams;
@@ -140,7 +139,7 @@ @@ -140,7 +139,7 @@ private InputStream decompress(UntarCompressionMethod compression, final File fi
} else if (compression == UntarCompressionMethod.XZ) { } else if (compression == UntarCompressionMethod.XZ) {
return new XZCompressorInputStream(istream); return new XZCompressorInputStream(istream);
} else if (compression == UntarCompressionMethod.ZSTD) { } else if (compression == UntarCompressionMethod.ZSTD) {
@ -38,3 +50,6 @@ diff -urEbwB plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiv
} }
return istream; return istream;
} }
--
2.45.2

BIN
plexus-archiver-4.8.0.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

BIN
plexus-archiver-4.9.2.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

6
plexus-archiver-build.xml
View File

@ -10,9 +10,10 @@
<property name="project.groupId" value="org.codehaus.plexus"/> <property name="project.groupId" value="org.codehaus.plexus"/>
<property name="project.artifactId" value="plexus-archiver"/> <property name="project.artifactId" value="plexus-archiver"/>
<property name="project.version" value="4.8.0"/> <property name="project.version" value="4.9.2"/>
<property name="compiler.source" value="1.8"/> <property name="compiler.release" value="8"/>
<property name="compiler.source" value="1.${compiler.release}"/>
<property name="compiler.target" value="${compiler.source}"/> <property name="compiler.target" value="${compiler.source}"/>
<property name="build.finalName" value="${project.artifactId}-${project.version}"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@ -51,6 +52,7 @@
encoding="UTF-8" encoding="UTF-8"
optimize="false" optimize="false"
deprecation="true" deprecation="true"
release="${compiler.release}"
target="${compiler.target}" target="${compiler.target}"
verbose="false" verbose="false"
fork="false" fork="false"

16
plexus-archiver.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Jun 13 16:12:11 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 4.9.2
* New features and improvements
+ Allow copy all files without timestamp checking by
DirectoryArchiver
+ Provide fluent setter for usingDefaultExcludes flag in
AbstractFileSet
+ Upgrade many dependencies
- Modified patches:
* 0001-Remove-support-for-snappy.patch
* plexus-archiver-4.8.0-no_zstd.patch ->
0002-Remove-support-for-zstd.patch
+ rediff to changed context
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 20 14:53:23 UTC 2024 - Fridrich Strba <fstrba@suse.com> Tue Feb 20 14:53:23 UTC 2024 - Fridrich Strba <fstrba@suse.com>

4
plexus-archiver.spec
View File

@ -17,7 +17,7 @@
Name: plexus-archiver Name: plexus-archiver
Version: 4.8.0 Version: 4.9.2
Release: 0 Release: 0
Summary: Plexus Archiver Component Summary: Plexus Archiver Component
License: Apache-2.0 License: Apache-2.0
@ -26,7 +26,7 @@ URL: https://codehaus-plexus.github.io/plexus-archiver
Source0: https://github.com/codehaus-plexus/plexus-archiver/archive/plexus-archiver-%{version}.tar.gz Source0: https://github.com/codehaus-plexus/plexus-archiver/archive/plexus-archiver-%{version}.tar.gz
Source1: %{name}-build.xml Source1: %{name}-build.xml
Patch0: 0001-Remove-support-for-snappy.patch Patch0: 0001-Remove-support-for-snappy.patch
Patch1: plexus-archiver-4.8.0-no_zstd.patch Patch1: 0002-Remove-support-for-zstd.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-compress BuildRequires: apache-commons-compress
BuildRequires: apache-commons-io BuildRequires: apache-commons-io