.gitignore

@@ -1 +1 @@
-SOURCES/plexus-archiver-4.2.4.tar.gz
+SOURCES/plexus-archiver-3.6.0.tar.gz

.plexus-archiver.metadata

@@ -1 +1 @@
-a21a59111ef3744829b5adecfdaa2c605a818a4f SOURCES/plexus-archiver-4.2.4.tar.gz
+11a9a7b8e894774d1acd5aa1c8ea0942856a0fbf SOURCES/plexus-archiver-3.6.0.tar.gz

SOURCES/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
 

SPECS/plexus-archiver.spec

@@ -1,11 +1,12 @@
-%bcond_with bootstrap
+%bcond_without snappy
 
 Name:           plexus-archiver
-Version:        4.2.4
+Version:        3.6.0
-Release:        5%{?dist}
+Release:        1%{?dist}
+Epoch:          0
 Summary:        Plexus Archiver Component
 License:        ASL 2.0
-URL:            https://codehaus-plexus.github.io/plexus-archiver
+URL:            http://codehaus-plexus.github.io/plexus-archiver
 BuildArch:      noarch
 
 Source0:        https://github.com/codehaus-plexus/plexus-archiver/archive/plexus-archiver-%{version}.tar.gz
@@ -13,11 +14,8 @@ Source0:        https://github.com/codehaus-plexus/plexus-archiver/archive/plexu
 Patch0:         0001-Remove-support-for-snappy.patch
 
 BuildRequires:  maven-local
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
 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)
@@ -25,9 +23,13 @@ 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)
-BuildRequires:  mvn(org.tukaani:xz)
+%if %{with snappy}
+BuildRequires:  mvn(org.iq80.snappy:snappy)
 %endif
 
+# Missing from xmvn-builddep
+BuildRequires:  mvn(org.tukaani:xz)
+
 %description
 The Plexus project seeks to create end-to-end developer tools for
 writing applications. At the core is the container, which can be
@@ -36,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
@@ -70,82 +71,8 @@ sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/Duplicat
 %license LICENSE
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.2.4-5
+* Tue Dec 12 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0:3.6.0-1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for MSVSphere 8.8
-  Related: rhbz#1991688
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.4-4
-- Rebuild to workaround DistroBaker issue
-
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.4-3
-- Bootstrap Maven for CentOS Stream 9
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.4-2
-- Bootstrap build
-- Non-bootstrap build
-
-* Fri Feb 12 2021 Marian Koncek <mkoncek@redhat.com> - 4.2.4-1
-- Update to upstream version 4.2.4
-
-* Sat Jan 30 2021 Fabio Valentini <decathorpe@gmail.com> - 0:4.2.4-1
-- Update to version 4.2.4.
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:4.2.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Dec  4 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.3-1
-- Update to upstream version 4.2.3
-
-* Sat Oct 24 2020 Fabio Valentini <decathorpe@gmail.com> - 0:4.2.3-1
-- Update to version 4.2.3.
-
-* Mon Aug 03 2020 Marian Koncek <mkoncek@redhat.com> - 4.2.2-1
-- Update to upstream version 4.2.2
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:4.2.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:4.2.2-2
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Mon Mar 02 2020 Fabio Valentini <decathorpe@gmail.com> - 0:4.2.2-1
-- Update to version 4.2.2.
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:4.2.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Nov 20 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.1-1
-- Update to upstream version 4.2.1
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.0-2
-- Mass rebuild for javapackages-tools 201902
-
-* Mon Oct 28 2019 Fabio Valentini <decathorpe@gmail.com> - 0:4.2.1-1
-- Update to version 4.2.1.
-
-* Thu Oct 24 2019 Fabio Valentini <decathorpe@gmail.com> - 0:4.2.0-1
-- Update to version 4.2.0.
-
-* Wed Oct 23 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.0-1
-- Update to upstream version 4.2.0
-
-* Wed Aug 07 2019 Marian Koncek <mkoncek@redhat.com> - 0:4.1.0-1
-- Update to upstream version 4.1.0
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.6.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* 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
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.6.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.6.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Wed May 09 2018 Michael Simacek <msimacek@redhat.com> - 0:3.6.0-1
 - Update to upstream version 3.6.0