From 59f0a28e226aedf4acf0d71d5f74b9f87688fd99 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:11 +0200 Subject: [PATCH 1/9] Mass rebuild for javapackages-tools 201901 --- maven-remote-resources-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec index 3a8fea6..547b429 100644 --- a/maven-remote-resources-plugin.spec +++ b/maven-remote-resources-plugin.spec @@ -1,6 +1,6 @@ Name: maven-remote-resources-plugin Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maven Remote Resources Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-remote-resources-plugin/ @@ -60,6 +60,9 @@ API documentation for %{name}. %doc LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.5-3 +- Mass rebuild for javapackages-tools 201901 + * Thu Feb 08 2018 Fedora Release Engineering - 1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From eb60c3212f645b8892b9e895fdad44e73cfb55e8 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 31 May 2019 11:10:27 +0200 Subject: [PATCH 2/9] Update to upstream version 1.6.0 --- .gitignore | 1 + maven-remote-resources-plugin.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 97245d6..96aa806 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ 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 diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec index 547b429..c07df8a 100644 --- a/maven-remote-resources-plugin.spec +++ b/maven-remote-resources-plugin.spec @@ -1,6 +1,6 @@ Name: maven-remote-resources-plugin -Version: 1.5 -Release: 3%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Summary: Maven Remote Resources Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-remote-resources-plugin/ @@ -22,6 +22,7 @@ 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.velocity:velocity) BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) @@ -48,7 +49,7 @@ API documentation for %{name}. %build # Tests use Maven 2 APIs -%mvn_build -f +%mvn_build %install %mvn_install @@ -60,6 +61,9 @@ API documentation for %{name}. %doc LICENSE NOTICE %changelog +* 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 diff --git a/sources b/sources index a688f68..25dfd24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-remote-resources-plugin-1.5-source-release.zip) = 91906ffeb101147210cff36f5cafceb8e1cd8ac2ef90d5ddc8be894528af4b9510773abf2bf53cd9da2dfa62746de8fe05bb3e1ef15855fb94288d1d83dc4216 +SHA512 (maven-remote-resources-plugin-1.6.0-source-release.zip) = 75b0840478e20986bcb6133778f666e63c5670a885cc63adac1824a138ba3954f344c0336289f8c7799e413570e943ff60e9fa1fd67c710a0cd355dd1e4f400c From 7c02b33a66009cf29b8a4ad49925148bf2205df1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 31 May 2019 11:11:55 +0200 Subject: [PATCH 3/9] Port to Maven 3 --- 0001-Port-to-Maven-3.patch | 103 +++++++++++++++++++++++++++++ maven-remote-resources-plugin.spec | 23 ++++--- 2 files changed, 117 insertions(+), 9 deletions(-) create mode 100644 0001-Port-to-Maven-3.patch diff --git a/0001-Port-to-Maven-3.patch b/0001-Port-to-Maven-3.patch new file mode 100644 index 0000000..53247ee --- /dev/null +++ b/0001-Port-to-Maven-3.patch @@ -0,0 +1,103 @@ +From 3f1374b851cf9e52c8e276248005f21464965a96 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 | 4 ++++ + .../remote/stub/MavenProjectBasicStub.java | 18 +++++++++--------- + 3 files changed, 16 insertions(+), 12 deletions(-) + +diff --git a/pom.xml b/pom.xml +index deea77c..2203d3b 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -68,7 +68,7 @@ under the License. + + + +- 2.2.1 ++ 3.6.1 + 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..31d50a3 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 +@@ -38,6 +38,7 @@ 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; +@@ -298,6 +299,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 +505,7 @@ public class RemoteResourcesMojoTest + project.getBasedir().toString(), + new Properties(), + Calendar.getInstance().getTime() ); ++ session.setProjects( Collections.singletonList( project ) ); + + 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/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec index c07df8a..10ac12a 100644 --- a/maven-remote-resources-plugin.spec +++ b/maven-remote-resources-plugin.spec @@ -8,21 +8,26 @@ BuildArch: 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 + BuildRequires: maven-local -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-monitor) -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(commons-io:commons-io) +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-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) @@ -46,9 +51,9 @@ API documentation for %{name}. %prep %setup -q +%patch0 -p1 %build -# Tests use Maven 2 APIs %mvn_build %install From daa13df054d24719ff78f96abe434c4480d98c93 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 16 Oct 2019 14:35:30 +0200 Subject: [PATCH 4/9] Port to Maven 3.6.2 --- 0001-Port-to-Maven-3.patch | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/0001-Port-to-Maven-3.patch b/0001-Port-to-Maven-3.patch index 53247ee..25906e8 100644 --- a/0001-Port-to-Maven-3.patch +++ b/0001-Port-to-Maven-3.patch @@ -1,16 +1,16 @@ -From 3f1374b851cf9e52c8e276248005f21464965a96 Mon Sep 17 00:00:00 2001 +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 | 4 ++++ + .../remote/RemoteResourcesMojoTest.java | 8 ++++++++ .../remote/stub/MavenProjectBasicStub.java | 18 +++++++++--------- - 3 files changed, 16 insertions(+), 12 deletions(-) + 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml -index deea77c..2203d3b 100644 +index deea77c..eafa229 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ under the License. @@ -18,7 +18,7 @@ index deea77c..2203d3b 100644 - 2.2.1 -+ 3.6.1 ++ 3.6.2 3.1.1 3.3 @@ -41,10 +41,18 @@ index deea77c..2203d3b 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..31d50a3 100644 +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 -@@ -38,6 +38,7 @@ import java.net.URL; +@@ -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; @@ -52,7 +60,12 @@ index 8637767..31d50a3 100644 import java.util.Properties; import java.util.jar.JarOutputStream; import java.util.zip.ZipEntry; -@@ -298,6 +299,8 @@ public class RemoteResourcesMojoTest + 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" ); @@ -61,11 +74,13 @@ index 8637767..31d50a3 100644 String path = repo.pathOf( new DefaultArtifact( "test", "test", VersionRange.createFromVersion( "1.1" ), -@@ -502,6 +505,7 @@ public class RemoteResourcesMojoTest +@@ -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() ) ); From ed49ffa547b83a012aeeef0b11381243c22398c9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 5/9] Mass rebuild for javapackages-tools 201902 --- maven-remote-resources-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec index 10ac12a..a86d439 100644 --- a/maven-remote-resources-plugin.spec +++ b/maven-remote-resources-plugin.spec @@ -1,6 +1,6 @@ Name: maven-remote-resources-plugin Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Maven Remote Resources Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-remote-resources-plugin/ @@ -66,6 +66,9 @@ API documentation for %{name}. %doc LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.6.0-2 +- Mass rebuild for javapackages-tools 201902 + * Fri May 31 2019 Marian Koncek - 1.6.0-1 - Update to upstream version 1.6.0 From 0076cbd57c0989b2eb8182f32c3a0d569ad99c0b Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jan 2020 16:17:24 +0100 Subject: [PATCH 6/9] Update to upstream version 1.7.0 --- .gitignore | 1 + 0001-Port-to-Maven-3.patch | 60 +++++++++++++++++++----------- maven-remote-resources-plugin.spec | 11 ++++-- sources | 2 +- 4 files changed, 47 insertions(+), 27 deletions(-) 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 From 0198e0ec5ab8683825b138d86f34587308cc9bab Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 17 May 2020 09:38:19 +0200 Subject: [PATCH 7/9] Remove dependency on maven-artifact-resolver --- 0001-Port-to-Maven-3.patch | 24 ++++++++++++++++++------ maven-remote-resources-plugin.spec | 1 - 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/0001-Port-to-Maven-3.patch b/0001-Port-to-Maven-3.patch index 5ce80bb..aa55c42 100644 --- a/0001-Port-to-Maven-3.patch +++ b/0001-Port-to-Maven-3.patch @@ -1,17 +1,17 @@ -From 311be5bb7f5c2253ec6233ae48073ecc15d3971a Mon Sep 17 00:00:00 2001 +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 | 6 +++--- + pom.xml | 11 +++-------- .../remote/RemoteResourcesMojoTest.java | 8 ++++++++ .../resources/remote/stub/ArtifactStub.java | 6 ------ .../remote/stub/MavenProjectBasicStub.java | 18 +++++++++--------- - 4 files changed, 20 insertions(+), 18 deletions(-) + 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml -index dc43173..2aa17fb 100644 +index dc43173..6c3dbfe 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ under the License. @@ -32,7 +32,19 @@ index dc43173..2aa17fb 100644 ${mavenVersion} -@@ -174,7 +174,7 @@ under the License. +@@ -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 @@ -130,5 +142,5 @@ index 0107561..6e9a8b0 100644 super.setExecutionProject( this ); super.setArtifact( artifact ); -- -2.21.0 +2.25.4 diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec index 89ed940..87d4ff9 100644 --- a/maven-remote-resources-plugin.spec +++ b/maven-remote-resources-plugin.spec @@ -17,7 +17,6 @@ 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) From 3ede547f6b4f262f46016dee4983a4cfa5571773 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 8/9] Conditionalize buildrequires in bootstrap mode --- maven-remote-resources-plugin.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec index 87d4ff9..b1fad34 100644 --- a/maven-remote-resources-plugin.spec +++ b/maven-remote-resources-plugin.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: maven-remote-resources-plugin Version: 1.7.0 Release: 1%{?dist} @@ -11,6 +13,9 @@ Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/ 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(junit:junit) BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) @@ -33,6 +38,7 @@ 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 From b0b8d41ce1d7c157882ee754a81c6233d9563b13 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 9/9] Turn off bootstrap mode by default --- maven-remote-resources-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec index b1fad34..c8a00ab 100644 --- a/maven-remote-resources-plugin.spec +++ b/maven-remote-resources-plugin.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: maven-remote-resources-plugin Version: 1.7.0