.gitignore

@@ -1 +1,27 @@
-SOURCES/plexus-archiver-4.2.0.tar.gz
+plexus-archiver-src.tar.gz
+plexus-archiver-1.0-alpha-12-src.tar.bz2
+plexus-archiver-1.1-src.tar.xz
+/plexus-archiver-1.2.tar.xz
+plexus-archiver-2.0.1.tar.xz
+sonatype-plexus-archiver-plexus-archiver-2.1-0-g9913f73.tar.gz
+sonatype-plexus-archiver-plexus-archiver-2.1.1-0-ge64d181.tar.gz
+/sonatype-plexus-archiver-plexus-archiver-2.2-0-g450d320.tar.gz
+/plexus-archiver-2.2.tar.gz
+/LICENSE-2.0.txt
+/plexus-archiver-2.3.tar.gz
+/plexus-archiver-2.4.2.tar.gz
+/plexus-archiver-2.4.4.tar.gz
+/plexus-archiver-2.6.1.tar.gz
+/plexus-archiver-2.6.2.tar.gz
+/plexus-archiver-2.6.3.tar.gz
+/plexus-archiver-2.7.tar.gz
+/plexus-archiver-2.7.1.tar.gz
+/plexus-archiver-2.8.tar.gz
+/plexus-archiver-2.8.2.tar.gz
+/plexus-archiver-3.0.tar.gz
+/plexus-archiver-dc873a4.tar.gz
+/plexus-archiver-3.1.1.tar.gz
+/plexus-archiver-3.3.tar.gz
+/plexus-archiver-3.4.tar.gz
+/plexus-archiver-3.5.tar.gz
+/plexus-archiver-3.6.0.tar.gz

.plexus-archiver.metadata

@@ -1 +0,0 @@
-b86b30a0888dc9348e5c79a10a5e0f7e9aeaa159 SOURCES/plexus-archiver-4.2.0.tar.gz

0001-Remove-support-for-snappy.patch

@@ -1,15 +1,15 @@
-From 6e2004d90deab2f59af01629187006e320444e34 Mon Sep 17 00:00:00 2001
+From bd1055a190a1a64374f4aeb3bfde138d9c3d965f Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Sat, 23 Sep 2017 11:43:45 +0200
 Subject: [PATCH] Remove support for snappy
 
 ---
- .../java/org/codehaus/plexus/archiver/tar/TarArchiver.java     | 3 +--
+ src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java   | 3 +--
- .../java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java   | 3 +--
+ src/main/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 8eec881..be8e7a3 100644
+index 398ecf1..0d46cfc 100644
 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
 +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
 @@ -38,7 +38,6 @@
@@ -30,18 +30,18 @@ index 8eec881..be8e7a3 100644
          else if ( TarCompressionMethod.xz.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 2316d4e..c2e2b83 100644
+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
-@@ -31,7 +31,6 @@
+@@ -30,7 +30,6 @@
+ import org.codehaus.plexus.archiver.ArchiverException;
  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 <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
-@@ -154,7 +153,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 )
+@@ -153,7 +152,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 )
          }
          else if ( compression == UntarCompressionMethod.SNAPPY )
          {
@@ -51,5 +51,5 @@ index 2316d4e..c2e2b83 100644
          else if ( compression == UntarCompressionMethod.XZ )
          {
 -- 
-2.21.0
+2.13.5
 

plexus-archiver.spec

@@ -1,6 +1,9 @@
+%bcond_without snappy
+
 Name:           plexus-archiver
-Version:        4.2.0
+Version:        3.6.0
-Release:        2%{?dist}
+Release:        1%{?dist}
+Epoch:          0
 Summary:        Plexus Archiver Component
 License:        ASL 2.0
 URL:            http://codehaus-plexus.github.io/plexus-archiver
@@ -12,7 +15,7 @@ Patch0:         0001-Remove-support-for-snappy.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
-BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(org.apache.commons:commons-compress)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
@@ -20,6 +23,11 @@ BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-io)
 BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+%if %{with snappy}
+BuildRequires:  mvn(org.iq80.snappy:snappy)
+%endif
+
+# Missing from xmvn-builddep
 BuildRequires:  mvn(org.tukaani:xz)
 
 %description
@@ -30,29 +38,28 @@ reusable components for hibernate, form processing, jndi, i18n,
 velocity, etc. Plexus also includes an application server which
 is like a J2EE application server, without all the baggage.
 
+
 %package javadoc
 Summary:        Javadoc for %{name}
 
 %description javadoc
 Javadoc for %{name}.
 
+
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 %mvn_file :%{name} plexus/archiver
 
+%if %{without snappy}
 %patch0 -p1
 %pom_remove_dep org.iq80.snappy:snappy
 rm -rf src/main/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 src/test/java/org/codehaus/plexus/archiver/snappy/SnappyArchiverTest.java
+%endif
-rm src/test/java/org/codehaus/plexus/archiver/tar/TarSnappyUnArchiverTest.java
-
-# Tests use old plexus-containers-default
-sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java
 
 %build
-%mvn_build
+%mvn_build -f
 
 %install
 %mvn_install
@@ -64,18 +71,6 @@ sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/Duplicat
 %license LICENSE
 
 %changelog
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.0-2
-- Mass rebuild for javapackages-tools 201902
-
-* Wed Oct 23 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.0-1
-- Update to upstream version 4.2.0
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.1.0-2
-- Mass rebuild for javapackages-tools 201901
-
-* Wed Feb 27 2019 Marian Koncek <mkoncek@redhat.com> - 0:4.1.0-1
-- Update to upstream version 4.1.0
-
 * Wed May 09 2018 Michael Simacek <msimacek@redhat.com> - 0:3.6.0-1
 - Update to upstream version 3.6.0
 

sources

@@ -0,0 +1 @@
+SHA512 (plexus-archiver-3.6.0.tar.gz) = 060affdbb11330a773cf04f03714405b02890d4e320b8e071f178fe2bd1f021dd286f29184600dc83618b8c9d801388572fc26c5c129713c3870ef92d7a55828