Compare commits

...

No commits in common. "c8-stream-201902" and "c9-beta-stream-202201" have entirely different histories.

5 changed files with 68 additions and 37 deletions

1
.gitignore vendored
View File

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

View File

@ -1 +0,0 @@
657fa0c55468d9050bc59806a11c32e1ac913d0f SOURCES/maven-archiver-3.4.0-source-release.zip

View File

@ -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

Binary file not shown.

View File

@ -1,15 +1,19 @@
%bcond_with bootstrap
Name: maven-archiver
Version: 3.4.0
Release: 3%{?dist}
Version: 3.5.2
Release: 2%{?dist}
Summary: Maven Archiver
License: ASL 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)
@ -19,9 +23,10 @@ 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.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)
%endif
%description
The Maven Archiver is used by other Maven plugins
@ -35,7 +40,6 @@ Javadoc for %{name}.
%prep
%setup -q
%patch0 -p1
%build
%mvn_build
@ -44,15 +48,65 @@ Javadoc for %{name}.
%mvn_install
%files -f .mfiles
%doc LICENSE NOTICE CONTRIBUTING.md README.md
%doc LICENSE NOTICE README.md
%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
%changelog
* 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 +114,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