diff --git a/.gitignore b/.gitignore index 96aa806..566f7e5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ maven-remote-resources-plugin-1.2.1-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 index 25906e8..5ce80bb 100644 --- a/0001-Port-to-Maven-3.patch +++ b/0001-Port-to-Maven-3.patch @@ -6,11 +6,12 @@ Subject: [PATCH] Port to Maven 3 --- pom.xml | 6 +++--- .../remote/RemoteResourcesMojoTest.java | 8 ++++++++ + .../resources/remote/stub/ArtifactStub.java | 6 ------ .../remote/stub/MavenProjectBasicStub.java | 18 +++++++++--------- - 3 files changed, 20 insertions(+), 12 deletions(-) + 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml -index deea77c..eafa229 100644 +index dc43173..2aa17fb 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ under the License. @@ -19,10 +20,10 @@ index deea77c..eafa229 100644 - 2.2.1 + 3.6.2 + 7 3.1.1 3.3 - -@@ -97,7 +97,7 @@ under the License. +@@ -98,7 +98,7 @@ under the License. org.apache.maven @@ -31,7 +32,7 @@ index deea77c..eafa229 100644 ${mavenVersion} -@@ -168,7 +168,7 @@ under the License. +@@ -174,7 +174,7 @@ under the License. org.apache.maven.plugin-testing maven-plugin-testing-harness @@ -41,7 +42,7 @@ index deea77c..eafa229 100644 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 +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; @@ -49,10 +50,10 @@ index 8637767..f2db4b9 100644 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; - import org.apache.maven.project.MavenProject; -@@ -38,10 +39,12 @@ import java.net.URL; +@@ -39,10 +40,12 @@ import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -65,7 +66,7 @@ index 8637767..f2db4b9 100644 /** -@@ -298,6 +301,8 @@ public class RemoteResourcesMojoTest +@@ -301,6 +304,8 @@ public class RemoteResourcesMojoTest setupDefaultProject( project ); ArtifactRepository repo = (ArtifactRepository) getVariableValueFromObject( mojo, "localRepository" ); @@ -74,7 +75,7 @@ index 8637767..f2db4b9 100644 String path = repo.pathOf( new DefaultArtifact( "test", "test", VersionRange.createFromVersion( "1.1" ), -@@ -502,6 +507,9 @@ public class RemoteResourcesMojoTest +@@ -505,6 +510,9 @@ public class RemoteResourcesMojoTest project.getBasedir().toString(), new Properties(), Calendar.getInstance().getTime() ); @@ -84,23 +85,38 @@ index 8637767..f2db4b9 100644 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 a8a1fad..d0d1fb9 100644 +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 -@@ -144,15 +144,15 @@ public class MavenProjectBasicStub +@@ -154,15 +154,15 @@ public class MavenProjectBasicStub { - // the pom should be located in the isolated dummy root + // 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.setDependencyArtifacts( new HashSet() ); + super.setArtifacts( new HashSet() ); + super.setPluginArtifacts( new HashSet() ); diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec index a86d439..89ed940 100644 --- a/maven-remote-resources-plugin.spec +++ b/maven-remote-resources-plugin.spec @@ -1,12 +1,12 @@ Name: maven-remote-resources-plugin -Version: 1.6.0 -Release: 2%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: Maven Remote Resources Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-remote-resources-plugin/ BuildArch: noarch -Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip +Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip Patch0: 0001-Port-to-Maven-3.patch @@ -22,6 +22,7 @@ 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) @@ -34,7 +35,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) BuildRequires: mvn(org.codehaus.plexus:plexus-resources) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) - %description Process resources packaged in JARs that have been deployed to a remote repository. The primary use case being satisfied is @@ -66,6 +66,9 @@ API documentation for %{name}. %doc LICENSE NOTICE %changelog +* 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 diff --git a/sources b/sources index 25dfd24..98b2f6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-remote-resources-plugin-1.6.0-source-release.zip) = 75b0840478e20986bcb6133778f666e63c5670a885cc63adac1824a138ba3954f344c0336289f8c7799e413570e943ff60e9fa1fd67c710a0cd355dd1e4f400c +SHA512 (maven-remote-resources-plugin-1.7.0-source-release.zip) = 84adbcae661ad59f5c27c06f546ffb2a9d717eb5451194b522160d53d6877d0d2dce155352305cba43a67cf6579f3dfbf88694cd84b72960507308c4382038b6