diff --git a/.gitignore b/.gitignore index e69de29..15df1fb 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,7 @@ +maven-plugin-testing-1.2.tar.xz +/maven-plugin-testing-2.0-alpha-1.tar.xz +/maven-plugin-testing-2.1-source-release.zip +/maven-plugin-testing-3.0.0-source-release.zip +/maven-plugin-testing-3.1.0-source-release.zip +/maven-plugin-testing-3.2.0-source-release.zip +/maven-plugin-testing-3.3.0-source-release.zip diff --git a/0001-Port-to-plexus-utils-3.0.21.patch b/0001-Port-to-plexus-utils-3.0.21.patch new file mode 100644 index 0000000..91b6aab --- /dev/null +++ b/0001-Port-to-plexus-utils-3.0.21.patch @@ -0,0 +1,39 @@ +From a64a54900d64d7f2b699979a8abd46506d6779ad Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Fri, 27 Mar 2015 06:51:35 +0100 +Subject: [PATCH 1/2] Port to plexus-utils 3.0.21 + +--- + .../main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java | 2 +- + pom.xml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java +index 8b047a7..4d35dc4 100644 +--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java ++++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java +@@ -156,7 +156,7 @@ public abstract class AbstractMojoTestCase + XmlStreamReader reader = new XmlStreamReader( is ); + + InterpolationFilterReader interpolationFilterReader = +- new InterpolationFilterReader( new BufferedReader( reader ), container.getContext().getContextData() ); ++ new InterpolationFilterReader( new BufferedReader( reader ), ( Map ) container.getContext().getContextData() ); + + PluginDescriptor pluginDescriptor = new PluginDescriptorBuilder().build( interpolationFilterReader ); + +diff --git a/pom.xml b/pom.xml +index 0aab541..d0f0e7e 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -194,7 +194,7 @@ under the License. + + org.codehaus.plexus + plexus-utils +- 3.0.15 ++ 3.0.21 + provided + + +-- +2.5.0 + diff --git a/0002-Port-to-current-maven-artifact.patch b/0002-Port-to-current-maven-artifact.patch new file mode 100644 index 0000000..3c3bf7b --- /dev/null +++ b/0002-Port-to-current-maven-artifact.patch @@ -0,0 +1,75 @@ +From c36cd3c3eaad3ce9486d7c49c50b9d309a0d5fe1 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 24 Nov 2015 12:59:13 +0100 +Subject: [PATCH 2/2] Port to current maven-artifact + +--- + .../apache/maven/plugin/testing/stubs/StubArtifactCollector.java | 6 +++--- + .../org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java +index be7e156..c6a059e 100644 +--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java ++++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java +@@ -51,7 +51,7 @@ public class StubArtifactCollector + } + + public ArtifactResolutionResult collect( Set artifacts, Artifact originatingArtifact, +- Map managedVersions, ArtifactResolutionRequest repositoryRequest, ++ Map managedVersions, ArtifactResolutionRequest repositoryRequest, + ArtifactMetadataSource source, ArtifactFilter filter, + List listeners, + List conflictResolvers ) +@@ -60,7 +60,7 @@ public class StubArtifactCollector + } + + public ArtifactResolutionResult collect( Set artifacts, Artifact originatingArtifact, +- Map managedVersions, ArtifactRepository localRepository, ++ Map managedVersions, ArtifactRepository localRepository, + List remoteRepositories, + ArtifactMetadataSource source, ArtifactFilter filter, + List listeners, +@@ -70,7 +70,7 @@ public class StubArtifactCollector + } + + public ArtifactResolutionResult collect( Set artifacts, Artifact originatingArtifact, +- Map managedVersions, ArtifactRepository localRepository, ++ Map managedVersions, ArtifactRepository localRepository, + List remoteRepositories, + ArtifactMetadataSource source, ArtifactFilter filter, + List listeners ) +diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java +index cc02ec0..2d90152 100644 +--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java ++++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java +@@ -141,7 +141,7 @@ public class StubArtifactResolver + * @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.Map, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource) + */ + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, +- Map managedVersions, ArtifactRepository localRepository, ++ Map managedVersions, ArtifactRepository localRepository, + List remoteRepositories, ArtifactMetadataSource source ) + throws ArtifactResolutionException, ArtifactNotFoundException + { +@@ -153,7 +153,7 @@ public class StubArtifactResolver + * @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.Map, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource, org.apache.maven.artifact.resolver.filter.ArtifactFilter) + */ + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, +- Map managedVersions, ArtifactRepository localRepository, ++ Map managedVersions, ArtifactRepository localRepository, + List remoteRepositories, ArtifactMetadataSource source, + ArtifactFilter filter ) + throws ArtifactResolutionException, ArtifactNotFoundException +@@ -166,7 +166,7 @@ public class StubArtifactResolver + * @see org.apache.maven.artifact.resolver.ArtifactResolver#resolveTransitively(java.util.Set, org.apache.maven.artifact.Artifact, java.util.Map, org.apache.maven.artifact.repository.ArtifactRepository, java.util.List, org.apache.maven.artifact.metadata.ArtifactMetadataSource, org.apache.maven.artifact.resolver.filter.ArtifactFilter, java.util.List) + */ + public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, +- Map managedVersions, ArtifactRepository localRepository, ++ Map managedVersions, ArtifactRepository localRepository, + List remoteRepositories, ArtifactMetadataSource source, + ArtifactFilter filter, List listeners ) + throws ArtifactResolutionException, ArtifactNotFoundException +-- +2.5.0 + diff --git a/0003-Port-to-maven-3.8.1.patch b/0003-Port-to-maven-3.8.1.patch new file mode 100644 index 0000000..2786be2 --- /dev/null +++ b/0003-Port-to-maven-3.8.1.patch @@ -0,0 +1,33 @@ +From 4dc38f384dab2d825e1ab6f7df018650b6aeded1 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Fri, 17 Dec 2021 13:42:11 +0100 +Subject: [PATCH] Port to maven 3.8.1 + +--- + .../plugin/testing/stubs/StubArtifactRepository.java | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java +index 9a435b7..c13c3a8 100644 +--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java ++++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java +@@ -247,4 +247,16 @@ public class StubArtifactRepository + { + // no op + } ++ ++ @Override ++ public boolean isBlocked() ++ { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public void setBlocked(boolean blocked) ++ { ++ throw new UnsupportedOperationException(); ++ } + } +-- +2.31.1 + diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec new file mode 100644 index 0000000..ede71a9 --- /dev/null +++ b/maven-plugin-testing.spec @@ -0,0 +1,282 @@ +%bcond_with bootstrap + +Name: maven-plugin-testing +Version: 3.3.0 +Release: 26%{?dist} +Summary: Maven Plugin Testing +License: ASL 2.0 +URL: http://maven.apache.org/plugin-testing/ +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch + +Source0: http://repo1.maven.org/maven2/org/apache/maven/plugin-testing/%{name}/%{version}/%{name}-%{version}-source-release.zip + +Patch0: 0001-Port-to-plexus-utils-3.0.21.patch +Patch1: 0002-Port-to-current-maven-artifact.patch +Patch2: 0003-Port-to-maven-3.8.1.patch + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.maven:maven-aether-provider) +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-parent:pom:) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +%endif + +%description +The Maven Plugin Testing contains the necessary modules +to be able to test Maven Plugins. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +API documentation for %{name}. + +%package harness +Summary: Maven Plugin Testing Mechanism + +%description harness +The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo. + +%prep +%setup -q + +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :maven-source-plugin maven-plugin-testing-harness + +%pom_disable_module maven-plugin-testing-tools +%pom_disable_module maven-test-tools + +%mvn_alias : org.apache.maven.shared: + +%build +%mvn_build -s -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 + +%install +%mvn_install + +%files -f .mfiles-%{name} +%doc LICENSE NOTICE +%files harness -f .mfiles-%{name}-harness +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE + +%changelog +* Thu Jul 21 2022 Fedora Release Engineering - 3.3.0-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 3.3.0-25 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.3.0-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jan 05 2022 Marian Koncek - 3.3.0-23 +- Port to maven 3.8.1 + +* Tue Nov 02 2021 Mikolaj Izdebski - 3.3.0-22 +- Set explicit Java compiler source/target levels to 1.7 + +* Thu Jul 22 2021 Fedora Release Engineering - 3.3.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.3.0-20 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 3.3.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 3.3.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 3.3.0-17 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 3.3.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 3.3.0-14 +- Mass rebuild for javapackages-tools 201902 + +* Thu Jul 25 2019 Fedora Release Engineering - 3.3.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 3.3.0-13 +- Mass rebuild for javapackages-tools 201901 + +* Fri Feb 01 2019 Fedora Release Engineering - 3.3.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 3.3.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Igor Gnatenko - 3.3.0-12 +- Escape macros in %%changelog + +* Thu Feb 08 2018 Fedora Release Engineering - 3.3.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.3.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.3.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 02 2017 Michael Simacek - 3.3.0-8 +- Remove site-plugin from build + +* Thu Jun 02 2016 Michael Simacek - 3.3.0-7 +- Remove network using test + +* Thu Feb 04 2016 Fedora Release Engineering - 3.3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 24 2015 Michael Simacek - 3.3.0-5 +- Port to current maven-artifact + +* Fri Oct 16 2015 Mikolaj Izdebski - 3.3.0-4 +- Enable tests + +* Wed Jun 17 2015 Fedora Release Engineering - 3.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Mar 27 2015 Mikolaj Izdebski - 3.3.0-2 +- Port to plexus-utils 3.0.21 +- Remove legacy maven-shared provides +- Regenerate build-requires + +* Thu Feb 5 2015 Mikolaj Izdebski - 3.3.0-1 +- Update to upstream version 3.3.0 + +* Thu Feb 5 2015 Mikolaj Izdebski - 3.2.0-2 +- Add missing BR on maven-site-plugin +- Port to Maven 3.2.5 + +* Mon Jul 21 2014 Mikolaj Izdebski - 3.2.0-1 +- Update to upstream version 3.2.0 + +* Sat Jun 07 2014 Fedora Release Engineering - 3.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 26 2014 Mikolaj Izdebski - 3.1.0-3 +- Remove BuildRequires on maven-surefire-provider-junit4 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 3.1.0-2 +- Use Requires: java-headless rebuild (#1067528) + +* Mon Feb 24 2014 Michal Srb - 3.1.0-1 +- Update to upstream version 3.1.0 + +* Wed Feb 19 2014 Mikolaj Izdebski - 3.0.0-2 +- Fix unowned directory + +* Tue Jan 07 2014 Michal Srb - 3.0.0-1 +- Update to upstream version 3.0.0 + +* Tue Aug 06 2013 Michal Srb - 2.1-9 +- Port to Maven 3.1.0 (Resolves: #988253, #991860) + +* Thu Jul 25 2013 Alexander Kurtakov 2.1-8 +- Build against easymock3. + +* Mon Apr 22 2013 Michal Srb - 2.1-7 +- Another rebuild (Fix artifactId=None issue) + +* Wed Apr 10 2013 Mikolaj Izdebski - 2.1-6 +- Rebuild + +* Mon Mar 11 2013 Mikolaj Izdebski - 2.1-5 +- Install missing license files +- Build with xmvn +- Resolves: rhbz#920258 + +* Thu Feb 14 2013 Fedora Release Engineering - 2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 2.1-3 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Wed Jan 9 2013 Mikolaj Izdebski - 2.1-2 +- Fix easymock requires + +* Mon Jan 07 2013 Tomas Radej - 2.1-1 +- Updated to latest upstream version +- Cleanup - removed patches, old files etc. +- Added requires to subpackages + +* Thu Jul 19 2012 Fedora Release Engineering - 2.0-4.alpha1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 2.0-3.alpha1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Nov 10 2011 Jaromir Capik 2.0-2.alpha1 +- Structuring mess cleanup (depmap fragments split, removing jar duplicities) + +* Wed Nov 09 2011 Jaromir Capik 2.0-1.alpha1 +- Update to 2.0-alpha1 +- Spec file changes according to the latest guidelines + +* Thu Feb 10 2011 Alexander Kurtakov 1.2-9 +- Fix building. +- Adapt to current guidelines. + +* Tue Feb 08 2011 Fedora Release Engineering - 1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Sep 20 2010 Yong Yang 1.1-7 +- Build with plexus-containers 1.5.4 + +* Mon May 31 2010 Alexander Kurtakov 1.2-6 +- Proper obsolete for maven-shared-test-tools. + +* Mon May 31 2010 Alexander Kurtakov 1.2-5 +- One more item to the depmap. + +* Mon May 31 2010 Alexander Kurtakov 1.2-4 +- Add depmap to fix build. + +* Sat May 29 2010 Alexander Kurtakov 1.2-3 +- Obsolete maven-shared-test-tools. + +* Thu May 27 2010 Yong Yang 1:1.2-2.8 +- Fix parent pom install + +* Thu May 27 2010 Yong Yang 1:1.2-2.7 +- Fix installed pom.xml source path + +* Thu May 27 2010 Yong Yang 1:1.2-2.6 +- Add more maven depmap for maven-test-tools and maven-plugin-testing-tools for backward compatibility + +* Thu May 27 2010 Yong Yang 1:1.2-2.5 +- Fix maven-plugin-testing-tools pom name + +* Thu May 27 2010 Yong Yang 1:1.2-2.4 +- Change JPP.%%{name}.%%{name}-harness.pom to JPP.%%{name}-%%{name}-harness.pom + +* Thu May 27 2010 Yong Yang 1:1.2-2.3 +- Remove epoch in Requires of maven-test-tools + +* Wed May 12 2010 Alexander Kurtakov 1:1.2-2 +- Fix line lengths and use macroses consistently. +- Add comment for the tests skip. +- Add missing requires and set permissions. + +* Wed May 12 2010 Alexander Kurtakov 1:1.2-1 +- Initial package. diff --git a/sources b/sources new file mode 100644 index 0000000..71ff2ee --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (maven-plugin-testing-3.3.0-source-release.zip) = d4a36aeec71244d93ab880dfec88f48415098926898926094b53708e4ea0c49a7f82c4f058ec73e2c41d9650b370ca6526d73c067e8367ffec9324c1164e6d1e