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/maven-plugin-testing-3.3.0-source-release.zip b/maven-plugin-testing-3.3.0-source-release.zip new file mode 100644 index 0000000..9c60724 Binary files /dev/null and b/maven-plugin-testing-3.3.0-source-release.zip differ diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec new file mode 100644 index 0000000..6601e09 --- /dev/null +++ b/maven-plugin-testing.spec @@ -0,0 +1,86 @@ +Name: maven-plugin-testing +Version: 3.3.0 +Release: 14 +Summary: Maven Plugin Testing +License: ASL 2.0 +URL: http://maven.apache.org/plugin-testing/ +Source0: http://repo1.maven.org/maven2/org/apache/maven/plugin-testing/%{name}/%{version}/%{name}-%{version}-source-release.zip +Patch0001: 0001-Port-to-plexus-utils-3.0.21.patch +Patch0002: 0002-Port-to-current-maven-artifact.patch +BuildArch: noarch + +BuildRequires: maven-local mvn(commons-io:commons-io) mvn(junit:junit) +BuildRequires: mvn(org.apache.maven:maven-aether-provider) mvn(org.apache.maven:maven-compat) +BuildRequires: mvn(org.apache.maven:maven-core) mvn(org.apache.maven:maven-model) +BuildRequires: mvn(org.apache.maven:maven-parent:pom:) mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) mvn(org.apache.maven.shared:maven-invoker) +BuildRequires: mvn(org.apache.maven.wagon:wagon-file) mvn(org.codehaus.plexus:plexus-archiver) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.easymock:easymock) + +%description +The Maven Plugin Testing Modules contains the necessary tools to be able to test Maven Plugins. + +%package harness +Summary: Mechanism for managing tests on Mojo +Obsoletes: maven-shared-plugin-testing-harness <= 0:1.2 + +%description harness +This package provides mechanisms to manage tests on Mojo. + +%package tools +Summary: Tools for Maven Plugin Testing +Obsoletes: maven-shared-plugin-testing-tools <= 0:%{version}-%{release} + +%description tools +Tools for Maven Plugin Testing. + +%package -n maven-test-tools +Summary: Tools for Maven Testing +Obsoletes: maven-shared-test-tools <= 0:%{version}-%{release} + +%description -n maven-test-tools +Framework to test Maven Plugins with Easymock objects. + +%package help +Summary: Help documentation for maven-plugin-testing +Provides: %{name}-javadoc = %{version}-%{release} +Obsoletes: %{name}-javadoc < %{version}-%{release} + +%description help +Help documentation for maven-plugin-testing. + +%prep +%autosetup -n %{name}-%{version} -p1 + +%pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :maven-site-plugin + +sed -i -e "s/MockControl/IMocksControl/g" \ +maven-test-tools/src/main/java/org/apache/maven/shared/tools/easymock/MockManager.java + +rm maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java + +%mvn_alias : org.apache.maven.shared: + +%build +%mvn_build -s + +%install +%mvn_install + +%files -f .mfiles-maven-plugin-testing +%doc NOTICE LICENSE + +%files harness -f .mfiles-maven-plugin-testing-harness + +%files tools -f .mfiles-maven-plugin-testing-tools + +%files -n maven-test-tools -f .mfiles-maven-test-tools + +%files help -f .mfiles-javadoc + +%changelog +* Fri Dec 13 2019 daiqianwen - 3.3.0-14 +- Package init +