import CS maven-archiver-3.6.2-3.module_el9+1171+eb38a622

.gitignore

@@ -1 +1 @@
-SOURCES/maven-archiver-3.4.0-source-release.zip
+SOURCES/maven-archiver-3.6.2-source-release.zip

.maven-archiver.metadata

@@ -1 +1 @@
-657fa0c55468d9050bc59806a11c32e1ac913d0f SOURCES/maven-archiver-3.4.0-source-release.zip
+1258cdebd56bc0bdb8cafc2e332700f4bfacfd3f SOURCES/maven-archiver-3.6.2-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
-
----
- .../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 cd5d05c..bef8529 100644
---- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
-+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
-@@ -41,8 +41,8 @@ import org.codehaus.plexus.archiver.jar.JarArchiver;
- import org.codehaus.plexus.archiver.jar.ManifestException;
- import org.junit.Ignore;
- import org.junit.Test;
--import org.sonatype.aether.RepositorySystemSession;
--import org.sonatype.aether.util.DefaultRepositorySystemSession;
-+import org.eclipse.aether.RepositorySystemSession;
-+import org.eclipse.aether.DefaultRepositorySystemSession;
- 
- import java.io.File;
- import java.io.IOException;
--- 
-2.20.1
-

SPECS/maven-archiver.spec

@@ -1,41 +1,44 @@
+%bcond_with bootstrap
+
 Name:           maven-archiver
-Version:        3.4.0
+Version:        3.6.2
 Release:        3%{?dist}
 Summary:        Maven Archiver
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            http://maven.apache.org/shared/maven-archiver/
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} 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
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  maven-local
-BuildRequires:  mvn(commons-io:commons-io)
-BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.maven:maven-artifact)
-BuildRequires:  mvn(org.apache.maven:maven-core)
-BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components:pom:)
-BuildRequires:  mvn(org.apache.maven.shared:maven-shared-utils)
+BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.assertj:assertj-core)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver) >= 4.1.0
+BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-interpolation)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-api)
+BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-params)
+BuildRequires:  mvn(org.mockito:mockito-core)
+BuildRequires:  mvn(org.slf4j:slf4j-simple)
+%endif
 
 %description
 The Maven Archiver is used by other Maven plugins
 to handle packaging
 
 %package javadoc
-Summary:        Javadoc for %{name}
+Summary:        API documentation for %{name}
 
 %description javadoc
-Javadoc for %{name}.
+API documentation for %{name}.
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
+%pom_remove_dep :junit-bom
 
 %build
 %mvn_build
@@ -44,15 +47,105 @@ Javadoc for %{name}.
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE NOTICE CONTRIBUTING.md README.md
+%doc README.md
+%license LICENSE NOTICE
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %changelog
+* Fri Nov 29 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.2-2
+- Update javapackages test plan to f42
+
+* Fri Aug 23 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.2-1
+- Update to upstream version 3.6.2
+
+* Wed Jul 24 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.1-8
+- Install license files in licensedir instead of docdir
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 3.6.1-6
+- Rebuilt for java-21-openjdk as system jdk
+
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 3.6.1-5
+- bump of release for for java-21-openjdk as system jdk
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.1-2
+- Convert License tag to SPDX format
+
+* Fri Aug 25 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.1-1
+- Update to upstream version 3.6.1
+
+* Thu Aug 17 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.0-1
+- Update to upstream version 3.6.0
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Apr 26 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5.2-1
+- Update to upstream version 3.5.2
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.5.1-5
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* 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
 
@@ -60,6 +153,12 @@ Javadoc for %{name}.
 - 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