diff --git a/.gitignore b/.gitignore index abcffcf..566f7e5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ maven-remote-resources-plugin-1.2.1-source-release.zip /maven-remote-resources-plugin-1.3-source-release.zip /maven-remote-resources-plugin-1.4-source-release.zip /maven-remote-resources-plugin-1.5-source-release.zip +/maven-remote-resources-plugin-1.6.0-source-release.zip /maven-remote-resources-plugin-1.7.0-source-release.zip diff --git a/0001-Port-to-Maven-3.patch b/0001-Port-to-Maven-3.patch new file mode 100644 index 0000000..aa55c42 --- /dev/null +++ b/0001-Port-to-Maven-3.patch @@ -0,0 +1,146 @@ +From ad9b30a420fbbd509b232ac5fbba317605970c2c 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 | 11 +++-------- + .../remote/RemoteResourcesMojoTest.java | 8 ++++++++ + .../resources/remote/stub/ArtifactStub.java | 6 ------ + .../remote/stub/MavenProjectBasicStub.java | 18 +++++++++--------- + 4 files changed, 20 insertions(+), 23 deletions(-) + +diff --git a/pom.xml b/pom.xml +index dc43173..6c3dbfe 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -68,7 +68,7 @@ under the License. + + + +- 2.2.1 ++ 3.6.2 + 7 + 3.1.1 + 3.3 +@@ -98,7 +98,7 @@ under the License. + + + org.apache.maven +- maven-project ++ maven-compat + ${mavenVersion} + + +@@ -119,11 +119,6 @@ under the License. + maven-archiver + 3.5.0 + +- +- org.apache.maven.shared +- maven-artifact-resolver +- 1.0 +- + + org.apache.maven.shared + maven-common-artifact-filters +@@ -174,7 +169,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 24c928f..3294d4b 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.MavenProjectBuildStub; + import org.apache.maven.plugin.resources.remote.stub.MavenProjectResourcesStub; + import org.apache.maven.plugin.testing.AbstractMojoTestCase; +@@ -39,10 +40,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; + + + /** +@@ -301,6 +304,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" ), +@@ -505,6 +510,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/ArtifactStub.java b/src/test/java/org/apache/maven/plugin/resources/remote/stub/ArtifactStub.java +index 5f59c9a..fc52d6f 100644 +--- a/src/test/java/org/apache/maven/plugin/resources/remote/stub/ArtifactStub.java ++++ b/src/test/java/org/apache/maven/plugin/resources/remote/stub/ArtifactStub.java +@@ -376,10 +376,4 @@ public class ArtifactStub + return 0; + } + +- @Override +- public ArtifactMetadata getMetadata( Class metadataClass ) +- { +- return null; +- } +- + } +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 0107561..6e9a8b0 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 +@@ -154,15 +154,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.25.4 + diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec index d5a955f..9e7da48 100644 --- a/maven-remote-resources-plugin.spec +++ b/maven-remote-resources-plugin.spec @@ -1,34 +1,44 @@ +%bcond_with bootstrap + Name: maven-remote-resources-plugin Version: 1.7.0 Release: 4%{?dist} Summary: Maven Remote Resources Plugin License: ASL 2.0 - -URL: https://maven.apache.org/plugins/maven-remote-resources-plugin/ -Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip - +URL: http://maven.apache.org/plugins/maven-remote-resources-plugin/ BuildArch: noarch +Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip + +Patch0: 0001-Port-to-Maven-3.patch + BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(org.apache.maven:maven-archiver) -BuildRequires: mvn(org.apache.maven:maven-artifact:2.2.1) -BuildRequires: mvn(org.apache.maven:maven-core) -BuildRequires: mvn(org.apache.maven:maven-model:2.2.1) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-project) -BuildRequires: mvn(org.apache.maven:maven-settings:2.2.1) +BuildRequires: mvn(junit:junit) +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.plugin-tools:maven-plugin-annotations) -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-plugin-api) +BuildRequires: mvn(org.apache.maven:maven-settings) BuildRequires: mvn(org.apache.velocity:velocity) 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) +%endif %description Process resources packaged in JARs that have been deployed to @@ -46,10 +56,10 @@ API documentation for %{name}. %prep %setup -q +%patch0 -p1 %build -# Tests use Maven 2 APIs -%mvn_build -f +%mvn_build %install %mvn_install @@ -76,9 +86,21 @@ API documentation for %{name}. * 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