From 7c3d0fc3fd6d38d5cc422395a999211378bc221f52b93ddc05f62d76b4af8cc5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 22 Nov 2019 02:47:57 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-archiver?expand=0&rev=4 --- 0001-Remove-support-for-snappy.patch | 10 +++++----- plexus-archiver-3.6.0.tar.gz | 3 --- plexus-archiver-4.2.1.tar.gz | 3 +++ plexus-archiver-build.xml | 9 +-------- plexus-archiver.spec | 10 +++++----- 5 files changed, 14 insertions(+), 21 deletions(-) delete mode 100644 plexus-archiver-3.6.0.tar.gz create mode 100644 plexus-archiver-4.2.1.tar.gz diff --git a/0001-Remove-support-for-snappy.patch b/0001-Remove-support-for-snappy.patch index 561fa5f..6fdbf25 100644 --- a/0001-Remove-support-for-snappy.patch +++ b/0001-Remove-support-for-snappy.patch @@ -25,7 +25,7 @@ index 398ecf1..0d46cfc 100644 else if ( TarCompressionMethod.snappy.equals( tarCompressionMethod ) ) { - return new SnappyOutputStream( bufferedOutputStream( ostream ) ); -+ throw new UnsupportedOperationException( "This version of plexus-archiver does not support snappy compression" ); ++ throw new UnsupportedOperationException( "This version of plexus-archiver does not upport snappy compression" ); } else if ( TarCompressionMethod.xz.equals( tarCompressionMethod ) ) { @@ -33,20 +33,20 @@ diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b index 4bc94a4..15f0494 100644 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java -@@ -30,7 +30,6 @@ - import org.codehaus.plexus.archiver.ArchiverException; +@@ -31,7 +31,6 @@ import org.codehaus.plexus.archiver.util.Streams; + import org.codehaus.plexus.components.io.filemappers.FileMapper; import org.codehaus.plexus.util.IOUtil; -import org.iq80.snappy.SnappyInputStream; /** * @author Emmanuel Venisse -@@ -153,7 +152,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 ) +@@ -154,7 +153,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 ) } else if ( compression == UntarCompressionMethod.SNAPPY ) { - return new SnappyInputStream( istream, true ); -+ throw new UnsupportedOperationException( "This version of plexus-archiver does not support snappy compression" ); ++ throw new UnsupportedOperationException( "This version of plexus-archiver does not upport snappy compression" ); } else if ( compression == UntarCompressionMethod.XZ ) { diff --git a/plexus-archiver-3.6.0.tar.gz b/plexus-archiver-3.6.0.tar.gz deleted file mode 100644 index e5f892c..0000000 --- a/plexus-archiver-3.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c023487c261e07d11c874bc437a33e2fdefccf679af55cf8c579aa819a9e4f4 -size 564479 diff --git a/plexus-archiver-4.2.1.tar.gz b/plexus-archiver-4.2.1.tar.gz new file mode 100644 index 0000000..ee44900 --- /dev/null +++ b/plexus-archiver-4.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc278401f758b0de55ac5090296271a331b6c8c7ee65c82020acf247a14d2008 +size 570701 diff --git a/plexus-archiver-build.xml b/plexus-archiver-build.xml index 9b84544..2bc4c82 100644 --- a/plexus-archiver-build.xml +++ b/plexus-archiver-build.xml @@ -10,7 +10,7 @@ - + @@ -32,18 +32,11 @@ - - diff --git a/plexus-archiver.spec b/plexus-archiver.spec index 7a3f824..596a9c1 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-archiver # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %bcond_with tests %bcond_with snappy Name: plexus-archiver -Version: 3.6.0 +Version: 4.2.1 Release: 0 Summary: Plexus Archiver Component License: Apache-2.0 @@ -35,9 +35,9 @@ BuildRequires: apache-commons-io BuildRequires: fdupes BuildRequires: javapackages-local BuildRequires: jsr-305 -BuildRequires: plexus-containers-container-default -BuildRequires: plexus-io -BuildRequires: plexus-utils +BuildRequires: plexus-containers-container-default >= 2.1 +BuildRequires: plexus-io >= 3.2 +BuildRequires: plexus-utils >= 3.3 BuildRequires: xz-java Requires: mvn(org.apache.commons:commons-compress) Requires: mvn(org.codehaus.plexus:plexus-io) From 9f1173ef8b5a051787d59891ea96008ec5b70a224c09e753de951fd36749f6b9 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 24 Nov 2019 14:42:54 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-archiver?expand=0&rev=5 --- plexus-archiver.changes | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plexus-archiver.changes b/plexus-archiver.changes index d90d6c1..00199b6 100644 --- a/plexus-archiver.changes +++ b/plexus-archiver.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Nov 24 14:42:08 UTC 2019 - Fridrich Strba + +- Upgrade to version 4.2.1 +- Modified patch: + * 0001-Remove-support-for-snappy.patch + + rediff to changed context + ------------------------------------------------------------------- Mon Apr 1 23:12:20 UTC 2019 - Jan Engelhardt