diff --git a/0001-Port-to-Maven-3.1.0.patch b/0001-Port-to-Maven-3.1.0.patch new file mode 100644 index 0000000..f960cd8 --- /dev/null +++ b/0001-Port-to-Maven-3.1.0.patch @@ -0,0 +1,80 @@ +From 30f9f192aae98b73a15bd3b0a035c730bb269bab Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Tue, 6 Aug 2013 13:13:25 +0200 +Subject: [PATCH] Port to Maven 3.1.0 + +--- + .../java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java | 4 ++-- + .../main/java/org/apache/maven/shared/test/plugin/ProjectTool.java | 4 ++-- + .../main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java | 4 ++-- + 3 files changed, 6 insertions(+), 6 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 dec1a81..a9a8ab4 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 +@@ -49,7 +49,7 @@ import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder; + import org.apache.maven.plugin.logging.Log; + import org.apache.maven.project.MavenProject; + import org.apache.maven.repository.RepositorySystem; +-import org.apache.maven.repository.internal.MavenRepositorySystemSession; ++import org.apache.maven.repository.internal.MavenRepositorySystemUtils; + import org.codehaus.plexus.ContainerConfiguration; + import org.codehaus.plexus.DefaultContainerConfiguration; + import org.codehaus.plexus.DefaultPlexusContainer; +@@ -373,7 +373,7 @@ public abstract class AbstractMojoTestCase + MavenExecutionRequest request = new DefaultMavenExecutionRequest(); + MavenExecutionResult result = new DefaultMavenExecutionResult(); + +- MavenSession session = new MavenSession( container, new MavenRepositorySystemSession(), request, result ); ++ MavenSession session = new MavenSession( container, MavenRepositorySystemUtils.newSession(), request, result ); + session.setCurrentProject( project ); + session.setProjects( Arrays.asList( project ) ); + return session; +diff --git a/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java b/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java +index 4cb36a1..90b094e 100644 +--- a/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java ++++ b/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java +@@ -50,7 +50,7 @@ import org.apache.maven.project.ProjectBuilder; + import org.apache.maven.project.ProjectBuildingException; + import org.apache.maven.project.ProjectBuildingRequest; + import org.apache.maven.project.artifact.ProjectArtifactMetadata; +-import org.apache.maven.repository.internal.MavenRepositorySystemSession; ++import org.apache.maven.repository.internal.MavenRepositorySystemUtils; + import org.codehaus.plexus.component.annotations.Component; + import org.codehaus.plexus.component.annotations.Requirement; + import org.codehaus.plexus.util.FileUtils; +@@ -241,7 +241,7 @@ public class ProjectTool + { + ProjectBuildingRequest request = new DefaultProjectBuildingRequest(); + request.setLocalRepository( artifactRepositoryFactory.createArtifactRepository( "local", new File( "target/localrepo" ).getCanonicalFile().toURL().toExternalForm(), "default", null, null ) ); +- request.setRepositorySession( new MavenRepositorySystemSession() ); ++ request.setRepositorySession( MavenRepositorySystemUtils.newSession() ); + MavenProject project = projectBuilder.build( pomInfo.getPomFile(), request ).getProject(); + + Artifact artifact = artifactFactory.createArtifact( project.getGroupId(), project.getArtifactId(), project +diff --git a/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java b/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java +index 30bd492..de9c31d 100644 +--- a/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java ++++ b/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java +@@ -40,7 +40,7 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Reader; + import org.apache.maven.plugin.LegacySupport; + import org.apache.maven.project.MavenProject; + import org.apache.maven.project.artifact.ProjectArtifactMetadata; +-import org.apache.maven.repository.internal.MavenRepositorySystemSession; ++import org.apache.maven.repository.internal.MavenRepositorySystemUtils; + import org.apache.maven.settings.MavenSettingsBuilder; + import org.apache.maven.settings.Settings; + import org.codehaus.plexus.PlexusConstants; +@@ -218,7 +218,7 @@ public class RepositoryTool + destination.getParentFile().mkdirs(); + } + +- legacySupport.setSession( new MavenSession( container, new MavenRepositorySystemSession(), ++ legacySupport.setSession( new MavenSession( container, MavenRepositorySystemUtils.newSession(), + new DefaultMavenExecutionRequest(), + new DefaultMavenExecutionResult() ) ); + try +-- +1.8.1.4 + diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec index 0fb9bbb..e2fdbac 100644 --- a/maven-plugin-testing.spec +++ b/maven-plugin-testing.spec @@ -1,10 +1,11 @@ Name: maven-plugin-testing Version: 2.1 -Release: 8%{?dist} +Release: 9%{?dist} 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 +Patch0: 0001-Port-to-Maven-3.1.0.patch BuildArch: noarch BuildRequires: easymock3 @@ -56,13 +57,15 @@ Framework to test Maven Plugins with Easymock objects. %prep %setup -q +%patch0 -p1 + sed -i -e "s/MockControl/IMocksControl/g" maven-test-tools/src/main/java/org/apache/maven/shared/tools/easymock/MockManager.java %build %mvn_alias : org.apache.maven.shared: # Tests are skipped due to some test failures most probably caused by issues # with our plexus container -%mvn_build -f -s +%mvn_build -f -s -X %install %mvn_install @@ -76,6 +79,9 @@ sed -i -e "s/MockControl/IMocksControl/g" maven-test-tools/src/main/java/org/apa %doc LICENSE NOTICE %changelog +* 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.