diff --git a/.gitignore b/.gitignore index 9229c8c..33809a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/maven-remote-resources-plugin-1.6.0-source-release.zip +SOURCES/maven-remote-resources-plugin-3.1.0-source-release.zip diff --git a/.maven-remote-resources-plugin.metadata b/.maven-remote-resources-plugin.metadata index 26880c0..2d1f828 100644 --- a/.maven-remote-resources-plugin.metadata +++ b/.maven-remote-resources-plugin.metadata @@ -1 +1 @@ -39107bf7856a4d01b3e73d866ba63ab49ab547af SOURCES/maven-remote-resources-plugin-1.6.0-source-release.zip +4707aa8fcb0e7e4f510fb5dc48f7ecef0585e405 SOURCES/maven-remote-resources-plugin-3.1.0-source-release.zip diff --git a/SOURCES/0001-Port-to-Maven-3.patch b/SOURCES/0001-Port-to-Maven-3.patch deleted file mode 100644 index 25906e8..0000000 --- a/SOURCES/0001-Port-to-Maven-3.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 311be5bb7f5c2253ec6233ae48073ecc15d3971a Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Fri, 31 May 2019 11:09:13 +0200 -Subject: [PATCH] Port to Maven 3 - ---- - pom.xml | 6 +++--- - .../remote/RemoteResourcesMojoTest.java | 8 ++++++++ - .../remote/stub/MavenProjectBasicStub.java | 18 +++++++++--------- - 3 files changed, 20 insertions(+), 12 deletions(-) - -diff --git a/pom.xml b/pom.xml -index deea77c..eafa229 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -68,7 +68,7 @@ under the License. - - - -- 2.2.1 -+ 3.6.2 - 3.1.1 - 3.3 - -@@ -97,7 +97,7 @@ under the License. - - - org.apache.maven -- maven-project -+ maven-compat - ${mavenVersion} - - -@@ -168,7 +168,7 @@ under the License. - - org.apache.maven.plugin-testing - maven-plugin-testing-harness -- 1.3 -+ 3.3.0 - test - - -diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java b/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java -index 8637767..f2db4b9 100644 ---- a/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java -+++ b/src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java -@@ -25,6 +25,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository; - import org.apache.maven.artifact.versioning.VersionRange; - import org.apache.maven.execution.MavenSession; - import org.apache.maven.execution.ReactorManager; -+import org.apache.maven.plugin.LegacySupport; - import org.apache.maven.plugin.resources.remote.stub.MavenProjectResourcesStub; - import org.apache.maven.plugin.testing.AbstractMojoTestCase; - import org.apache.maven.project.MavenProject; -@@ -38,10 +39,12 @@ import java.net.URL; - import java.util.ArrayList; - import java.util.Arrays; - import java.util.Calendar; -+import java.util.Collections; - import java.util.Properties; - import java.util.jar.JarOutputStream; - import java.util.zip.ZipEntry; - import org.codehaus.plexus.util.IOUtil; -+import org.eclipse.aether.DefaultRepositorySystemSession; - - - /** -@@ -298,6 +301,8 @@ public class RemoteResourcesMojoTest - setupDefaultProject( project ); - - ArtifactRepository repo = (ArtifactRepository) getVariableValueFromObject( mojo, "localRepository" ); -+ MavenSession session = (MavenSession) getVariableValueFromObject( mojo, "mavenSession" ); -+ session.getRequest().setLocalRepository( repo ); - String path = repo.pathOf( new DefaultArtifact( "test", - "test", - VersionRange.createFromVersion( "1.1" ), -@@ -502,6 +507,9 @@ public class RemoteResourcesMojoTest - project.getBasedir().toString(), - new Properties(), - Calendar.getInstance().getTime() ); -+ session.setProjects( Collections.singletonList( project ) ); -+ setVariableValueToObject( session, "repositorySession", new DefaultRepositorySystemSession() ); -+ lookup( LegacySupport.class ).setSession( session ); - - setVariableValueToObject( mojo, "project", project ); - setVariableValueToObject( mojo, "outputDirectory", new File( project.getBuild().getOutputDirectory() ) ); -diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java b/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java -index a8a1fad..d0d1fb9 100644 ---- a/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java -+++ b/src/test/java/org/apache/maven/plugin/resources/remote/stub/MavenProjectBasicStub.java -@@ -144,15 +144,15 @@ public class MavenProjectBasicStub - { - // the pom should be located in the isolated dummy root - super.setFile( new File( getBasedir(), "pom.xml" ) ); -- super.setDependencyArtifacts( new HashSet() ); -- super.setArtifacts( new HashSet() ); -- super.setPluginArtifacts( new HashSet() ); -- super.setReportArtifacts( new HashSet() ); -- super.setExtensionArtifacts( new HashSet() ); -- super.setRemoteArtifactRepositories( new LinkedList() ); -- super.setPluginArtifactRepositories( new LinkedList() ); -- super.setCollectedProjects( new LinkedList() ); -- super.setActiveProfiles( new LinkedList() ); -+ super.setDependencyArtifacts( new HashSet() ); -+ super.setArtifacts( new HashSet() ); -+ super.setPluginArtifacts( new HashSet() ); -+ super.setReportArtifacts( new HashSet() ); -+ super.setExtensionArtifacts( new HashSet() ); -+ super.setRemoteArtifactRepositories( new LinkedList() ); -+ super.setPluginArtifactRepositories( new LinkedList() ); -+ super.setCollectedProjects( new LinkedList() ); -+ super.setActiveProfiles( new LinkedList() ); - super.setOriginalModel( null ); - super.setExecutionProject( this ); - super.setArtifact( artifact ); --- -2.21.0 - diff --git a/SPECS/maven-remote-resources-plugin.spec b/SPECS/maven-remote-resources-plugin.spec index a86d439..d4504b3 100644 --- a/SPECS/maven-remote-resources-plugin.spec +++ b/SPECS/maven-remote-resources-plugin.spec @@ -1,15 +1,19 @@ +%bcond_with bootstrap + Name: maven-remote-resources-plugin -Version: 1.6.0 -Release: 2%{?dist} +Version: 3.1.0 +Release: 14%{?dist} Summary: Maven Remote Resources Plugin -License: ASL 2.0 +License: Apache-2.0 URL: http://maven.apache.org/plugins/maven-remote-resources-plugin/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip - -Patch0: 0001-Port-to-Maven-3.patch +Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{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) @@ -17,23 +21,24 @@ BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) -BuildRequires: mvn(org.apache.maven.shared:maven-artifact-resolver) BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) BuildRequires: mvn(org.apache.maven.shared:maven-filtering) BuildRequires: mvn(org.apache.maven.shared:maven-verifier) -BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api) +BuildRequires: mvn(org.apache.maven:maven-archiver) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-compat) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) +BuildRequires: mvn(org.apache.maven:maven-model-builder) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-settings) -BuildRequires: mvn(org.apache.velocity:velocity) +BuildRequires: mvn(org.apache.velocity:velocity-engine-core) BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) -BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) BuildRequires: mvn(org.codehaus.plexus:plexus-resources) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) - +BuildRequires: mvn(org.eclipse.aether:aether-api) +BuildRequires: mvn(org.eclipse.aether:aether-util) +BuildRequires: mvn(org.slf4j:slf4j-simple) +%endif %description Process resources packaged in JARs that have been deployed to @@ -44,14 +49,13 @@ licensing requirements at Apache where each project much include license and notice files for each release. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc API documentation for %{name}. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build %mvn_build @@ -60,21 +64,100 @@ API documentation for %{name}. %mvn_install %files -f .mfiles -%doc LICENSE NOTICE +%license LICENSE NOTICE %files javadoc -f .mfiles-javadoc -%doc LICENSE NOTICE +%license LICENSE NOTICE %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 3.1.0-13 +- Update javapackages test plan to f42 + +* Wed Jul 24 2024 Mikolaj Izdebski - 3.1.0-8 +- Install license files in licensedir instead of docdir + +* Thu Jul 18 2024 Fedora Release Engineering - 3.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 3.1.0-6 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 3.1.0-5 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 3.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 3.1.0-2 +- Convert License tag to SPDX format + +* Wed Aug 23 2023 Mikolaj Izdebski - 3.1.0-1 +- Update to upstream version 3.1.0 + +* Thu Jul 20 2023 Fedora Release Engineering - 1.7.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.7.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.7.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.7.0-9 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1.7.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.7.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jul 08 2021 Mikolaj Izdebski - 1.7.0-6 +- Enable tests + +* Mon May 17 2021 Mikolaj Izdebski - 1.7.0-5 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.7.0-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Sat May 09 2020 Fabio Valentini - 1.7.0-1 +- Update to version 1.7.0. + +* Wed Jan 29 2020 Fedora Release Engineering - 1.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jan 29 2020 Marian Koncek - 1.7.0-1 +- Update to upstream version 1.7.0 + * Tue Nov 05 2019 Mikolaj Izdebski - 1.6.0-2 - Mass rebuild for javapackages-tools 201902 +* Thu Jul 25 2019 Fedora Release Engineering - 1.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 31 2019 Marian Koncek - 1.6.0-1 - Update to upstream version 1.6.0 * Fri May 24 2019 Mikolaj Izdebski - 1.5-3 - Mass rebuild for javapackages-tools 201901 +* Fri Feb 01 2019 Fedora Release Engineering - 1.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild