From 09b48328aaadd9d59f84da19f40e5b6a1bb1269ebffbcb9b940d00bfd20f6baa Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 13 Jun 2024 07:06:49 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-archiver?expand=0&rev=16 --- 0001-Remove-support-for-snappy.patch | 18 +++++------ ...atch => 0002-Remove-support-for-zstd.patch | 31 ++++++++++++++----- plexus-archiver-4.9.2.tar.gz | 3 ++ plexus-archiver-build.xml | 6 ++-- plexus-archiver.spec | 4 +-- 5 files changed, 41 insertions(+), 21 deletions(-) rename plexus-archiver-4.8.0-no_zstd.patch => 0002-Remove-support-for-zstd.patch (59%) create mode 100644 plexus-archiver-4.9.2.tar.gz diff --git a/0001-Remove-support-for-snappy.patch b/0001-Remove-support-for-snappy.patch index a52b44e..f598452 100644 --- a/0001-Remove-support-for-snappy.patch +++ b/0001-Remove-support-for-snappy.patch @@ -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 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 +-- - src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java | 3 +-- + .../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 398ecf1..0d46cfc 100644 +index cae07804..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 @@ @@ -20,7 +20,7 @@ index 398ecf1..0d46cfc 100644 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)) { return new BZip2CompressorOutputStream(bufferedOutputStream(ostream)); } else if (TarCompressionMethod.snappy.equals(tarCompressionMethod)) { @@ -30,7 +30,7 @@ index 398ecf1..0d46cfc 100644 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 4bc94a4..15f0494 100644 +index 1b0b7950..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 @@ @@ -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.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) { return new BZip2CompressorInputStream(istream); } else if (compression == UntarCompressionMethod.SNAPPY) { @@ -51,5 +51,5 @@ index 4bc94a4..15f0494 100644 return new XZCompressorInputStream(istream); } else if (compression == UntarCompressionMethod.ZSTD) { -- -2.13.5 +2.45.2 diff --git a/plexus-archiver-4.8.0-no_zstd.patch b/0002-Remove-support-for-zstd.patch similarity index 59% rename from plexus-archiver-4.8.0-no_zstd.patch rename to 0002-Remove-support-for-zstd.patch index a6560c9..53878f0 100644 --- a/plexus-archiver-4.8.0-no_zstd.patch +++ b/0002-Remove-support-for-zstd.patch @@ -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 ---- plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java 2023-09-04 18:07:46.209959586 +0200 -+++ plexus-archiver-4.8.0/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java 2023-09-04 18:14:27.122780479 +0200 +From f703c72614a8d78af30152f83004ac74ec8aadae Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fridrich=20=C5=A0trba?= +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 @@ import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; 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.ArchiveEntry; 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)) { return new XZCompressorOutputStream(bufferedOutputStream(ostream)); } 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; -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 ---- plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java 2023-09-04 18:07:46.209959586 +0200 -+++ plexus-archiver-4.8.0/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java 2023-09-04 18:13:50.092519851 +0200 +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 +--- 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; @@ -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.ArchiverException; 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) { return new XZCompressorInputStream(istream); } 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; } +-- +2.45.2 + diff --git a/plexus-archiver-4.9.2.tar.gz b/plexus-archiver-4.9.2.tar.gz new file mode 100644 index 0000000..2b775a3 --- /dev/null +++ b/plexus-archiver-4.9.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10c47c18663229c8e107972f3066cce55b9393649106a7b0d2ac66547aa19581 +size 584178 diff --git a/plexus-archiver-build.xml b/plexus-archiver-build.xml index df34a77..c660bde 100644 --- a/plexus-archiver-build.xml +++ b/plexus-archiver-build.xml @@ -10,9 +10,10 @@ - + - + + @@ -51,6 +52,7 @@ encoding="UTF-8" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="false" diff --git a/plexus-archiver.spec b/plexus-archiver.spec index 674eaa7..9cc5463 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -17,7 +17,7 @@ Name: plexus-archiver -Version: 4.8.0 +Version: 4.9.2 Release: 0 Summary: Plexus Archiver Component 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 Source1: %{name}-build.xml 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: apache-commons-compress BuildRequires: apache-commons-io From 9cb3d3f1534b7bd2eb5b5bc499fd50c4f9de2cf47002114b32f0b76ac0e7a0fa Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 13 Jun 2024 10:55:56 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-archiver?expand=0&rev=17 --- plexus-archiver-4.8.0.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 plexus-archiver-4.8.0.tar.gz diff --git a/plexus-archiver-4.8.0.tar.gz b/plexus-archiver-4.8.0.tar.gz deleted file mode 100644 index 9bbae1e..0000000 --- a/plexus-archiver-4.8.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36d3d9d1459c703ea41650d5aabf3f510bac4eb2df64e8da9cbabf59190d4eb2 -size 583483 From 92cd8305456e702d6894152831f1e7d0fa366b627d9b8ffafee6ed081866f8be Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 13 Jun 2024 16:16:19 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-archiver?expand=0&rev=18 --- plexus-archiver.changes | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/plexus-archiver.changes b/plexus-archiver.changes index b56f59b..ab73959 100644 --- a/plexus-archiver.changes +++ b/plexus-archiver.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Jun 13 16:12:11 UTC 2024 - Fridrich Strba + +- 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