diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..704a97c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-remote-resources-plugin-1.7.0-source-release.zip diff --git a/.maven-remote-resources-plugin.metadata b/.maven-remote-resources-plugin.metadata new file mode 100644 index 0000000..30adb13 --- /dev/null +++ b/.maven-remote-resources-plugin.metadata @@ -0,0 +1 @@ +cf62d1ac81e11a34ac0e5c05cb03edc9589db4b1 SOURCES/maven-remote-resources-plugin-1.7.0-source-release.zip diff --git a/SOURCES/0001-Port-to-Maven-3.patch b/SOURCES/0001-Port-to-Maven-3.patch new file mode 100644 index 0000000..aa55c42 --- /dev/null +++ b/SOURCES/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/SPECS/maven-remote-resources-plugin.spec b/SPECS/maven-remote-resources-plugin.spec new file mode 100644 index 0000000..efb0c16 --- /dev/null +++ b/SPECS/maven-remote-resources-plugin.spec @@ -0,0 +1,224 @@ +%bcond_with bootstrap + +Name: maven-remote-resources-plugin +Version: 1.7.0 +Release: 9%{?dist} +Summary: Maven Remote Resources Plugin +License: ASL 2.0 +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(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.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 +a remote repository. The primary use case being satisfied is +the consistent inclusion of common resources in a large set of +projects. Maven projects at Apache use this plug-in to satisfy +licensing requirements at Apache where each project much include +license and notice files for each release. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +API documentation for %{name}. + +%prep +%setup -q +%patch0 -p1 + +%build +%mvn_build + +%install +%mvn_install + +%files -f .mfiles +%doc LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE + +%changelog +* Mon Aug 09 2021 Mohan Boddu - 1.7.0-9 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Sun Jul 25 2021 Mikolaj Izdebski - 1.7.0-8 +- Enable tests + +* Wed Jun 09 2021 Mikolaj Izdebski - 1.7.0-7 +- Rebuild to workaround DistroBaker issue + +* Tue Jun 08 2021 Mikolaj Izdebski - 1.7.0-6 +- Bootstrap Maven for CentOS Stream 9 + +* 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 + +* Tue Sep 12 2017 Mikolaj Izdebski - 1.5-1 +- Update to upstream version 1.5 + +* Wed Jul 26 2017 Fedora Release Engineering - 1.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 21 2014 Mikolaj Izdebski - 1.4-8 +- Update to current packaging guidelines + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.4-7 +- Use Requires: java-headless rebuild (#1067528) + +* Thu Feb 20 2014 Mikolaj Izdebski - 1.4-6 +- Migrate to Wagon subpackages + +* Sat Aug 03 2013 Fedora Release Engineering - 1.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Apr 10 2013 Mikolaj Izdebski - 1.4-4 +- BuildRequire newer version of Plexus container + +* Thu Feb 14 2013 Fedora Release Engineering - 1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.4-2 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Tue Jan 15 2013 Mikolaj Izdebski - 1.4-1 +- Update to upstream version 1.4 + +* Thu Jul 19 2012 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed May 23 2012 Tomas Radej - 1.3-1 +- Updated to latest upstream release + +* Fri Jan 13 2012 Fedora Release Engineering - 1.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Nov 7 2011 Stanislav Ochotnicky - 1.2.1-3 +- Add plexus-resources to Requires + +* Wed Sep 07 2011 Tomas Radej - 1.2.1-2 +- Added license files + +* Tue Sep 6 2011 Alexander Kurtakov 1.2.1-1 +- Update to latest upstream release. + +* Tue Jul 5 2011 Alexander Kurtakov 1.2-3 +- BR modello. + +* Tue Jul 5 2011 Alexander Kurtakov 1.2-2 +- Add missing requires on maven-shared-downloader. + +* Thu Mar 17 2011 Alexander Kurtakov 1.2-1 +- Update to upstream 1.2 release. + +* Tue Feb 08 2011 Fedora Release Engineering - 1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Nov 3 2010 Stanislav Ochotnicky - 1.1-7 +- Fix velocity dependency in pom.xml + +* Thu Jul 15 2010 Stanislav Ochotnicky - 1.1-6 +- Fix bug #613582 + +* Tue Jul 13 2010 Hui Wang - 1.1-5 +- Add missing requires maven2 + +* Tue Jul 13 2010 Alexander Kurtakov 1.1-4 +- Add missing maven-shared-artifact-resolver requires. + +* Tue Jul 13 2010 Hui Wang - 1.1-3 +- Set '-Dmaven.test.skip=true' to fix Bug 613567 + +* Thu Jun 03 2010 Hui Wang - 1.1-2 +- Fixed descirption line length +- Added comment on patch0 +- Used macro in add_to_maven_depmap + +* Fri May 21 2010 Hui Wang - 1.1-1 +- Initial version of the package