.gitignore

@@ -1 +1 @@
-SOURCES/maven-archiver-3.2.0-source-release.zip
+SOURCES/maven-archiver-3.5.1-source-release.zip

.maven-archiver.metadata

@@ -1 +1 @@
-f0c79af389eec8195f969b15ba51496ec08eaba2 SOURCES/maven-archiver-3.2.0-source-release.zip
+d40d88abe9c7260c29fbbad1d4ac3a109512181c SOURCES/maven-archiver-3.5.1-source-release.zip

SOURCES/0001-Port-tests-to-Eclipse-Aether.patch

@@ -1,27 +0,0 @@
-From 160539b184376a4fc8ec29765f5278307a41d16e Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Mon, 19 Oct 2015 14:09:26 +0200
-Subject: [PATCH 1/2] Port tests to Eclipse Aether
-
----
- src/test/java/org/apache/maven/archiver/MavenArchiverTest.java | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
-index e877492..24ba9b1 100644
---- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
-+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
-@@ -40,8 +40,8 @@ import org.codehaus.plexus.PlexusContainer;
- import org.codehaus.plexus.archiver.jar.JarArchiver;
- import org.codehaus.plexus.archiver.jar.ManifestException;
- import org.junit.Test;
--import org.sonatype.aether.RepositorySystemSession;
--import org.sonatype.aether.util.DefaultRepositorySystemSession;
-+import org.eclipse.aether.DefaultRepositorySystemSession;
-+import org.eclipse.aether.RepositorySystemSession;
- 
- import java.io.File;
- import java.io.IOException;
--- 
-2.13.5
-

SOURCES/0002-MSHARED-448-Skip-failing-assertion.patch

@@ -1,26 +0,0 @@
-From 41e715cab5cfbd0373de2568ed9c6d022c3b403c Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Mon, 19 Oct 2015 14:34:53 +0200
-Subject: [PATCH 2/2] MSHARED-448: Skip failing assertion
-
----
- src/test/java/org/apache/maven/archiver/MavenArchiverTest.java | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
-index 24ba9b1..cefd00a 100644
---- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
-+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
-@@ -245,7 +245,8 @@ public class MavenArchiverTest
-         }
- 
-         archiver.createArchive( session, project, config );
--        assertEquals( jarFile.lastModified(), time );
-+	// Test fails (see MSHARED-448)
-+        // assertEquals( jarFile.lastModified(), time );
- 
-         config.setForced( true );
-         archiver.createArchive( session, project, config );
--- 
-2.13.5
-

SPECS/maven-archiver.spec

@@ -1,20 +1,19 @@
+%bcond_with bootstrap
+
 Name:           maven-archiver
-Version:        3.2.0
-Release:        2%{?dist}
-Epoch:          0
+Version:        3.5.1
+Release:        5%{?dist}
 Summary:        Maven Archiver
 License:        ASL 2.0
 URL:            http://maven.apache.org/shared/maven-archiver/
 BuildArch:      noarch
 
-Source0:        http://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip
-
-Patch0:         0001-Port-tests-to-Eclipse-Aether.patch
-# Test fails with OpenJDK on Linux
-# Reported upstream: https://issues.apache.org/jira/browse/MSHARED-448
-Patch1:         0002-MSHARED-448-Skip-failing-assertion.patch
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
@@ -26,6 +25,7 @@ BuildRequires:  mvn(org.assertj:assertj-core)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-interpolation)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+%endif
 
 %description
 The Maven Archiver is used by other Maven plugins
@@ -39,8 +39,6 @@ Javadoc for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %mvn_build
@@ -49,12 +47,73 @@ Javadoc for %{name}.
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE NOTICE
+%doc LICENSE NOTICE README.md
 
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
 
 %changelog
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.5.1-5
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5.1-4
+- Rebuild to workaround DistroBaker issue
+
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5.1-3
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5.1-2
+- Bootstrap build
+- Non-bootstrap build
+
+* Sat Jan 30 2021 Fabio Valentini <decathorpe@gmail.com> - 0:3.5.1-1
+- Update to version 3.5.1.
+
+* Thu Jan 28 2021 Marian Koncek <mkoncek@redhat.com> - 3.5.1-1
+- Update to upstream version 3.5.1
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.5.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.5.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:3.5.0-3
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Nov 20 2019 Marian Koncek <mkoncek@redhat.com> - 3.5.0-1
+- Update to upstream version 3.5.0
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.0-3
+- Mass rebuild for javapackages-tools 201902
+
+* Fri Nov 01 2019 Fabio Valentini <decathorpe@gmail.com> - 0:3.5.0-1
+- Update to version 3.5.0.
+
+* Thu Aug 08 2019 Marian Koncek <mkoncek@redhat.com> - 0:3.4.0-1
+- Update to upstream version 3.4.0
+- Fixes: RHBZ #1680430
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.0-2
+- Mass rebuild for javapackages-tools 201901
+
+* Wed Feb 27 2019 Marian Koncek <mkoncek@redhat.com> - 0:3.4.0-1
+- Update to upstream version 3.4.0
+- Fixes: RHBZ #1680430
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild