From 311be5bb7f5c2253ec6233ae48073ecc15d3971a Mon Sep 17 00:00:00 2001

From: Mikolaj Izdebski <mizdebsk@redhat.com>

Date: Fri, 31 May 2019 11:09:13 +0200

Subject: [PATCH] Port to Maven 3

---

 pom.xml                                        |  6 +++---

 .../remote/RemoteResourcesMojoTest.java        |  8 ++++++++

 .../remote/stub/MavenProjectBasicStub.java     | 18 +++++++++---------

 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml

index deea77c..eafa229 100644

--- a/pom.xml

+++ b/pom.xml

@@ -68,7 +68,7 @@ under the License.

   </distributionManagement>

   <properties>

-    <mavenVersion>2.2.1</mavenVersion>

+    <mavenVersion>3.6.2</mavenVersion>

     <mavenFilteringVersion>3.1.1</mavenFilteringVersion>

     <sitePluginVersion>3.3</sitePluginVersion>

   </properties>

@@ -97,7 +97,7 @@ under the License.

     </dependency>

     <dependency>

       <groupId>org.apache.maven</groupId>

-      <artifactId>maven-project</artifactId>

+      <artifactId>maven-compat</artifactId>

       <version>${mavenVersion}</version>

     </dependency>

     <dependency>

@@ -168,7 +168,7 @@ under the License.

     <dependency>

       <groupId>org.apache.maven.plugin-testing</groupId>

       <artifactId>maven-plugin-testing-harness</artifactId>

-      <version>1.3</version>

+      <version>3.3.0</version>

       <scope>test</scope>

     </dependency>

     <dependency>

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

--- 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.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;

+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;

 /**

@@ -298,6 +301,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 +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() ) );

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<Object>() );

-        super.setArtifacts( new HashSet<Object>() );

-        super.setPluginArtifacts( new HashSet<Object>() );

-        super.setReportArtifacts( new HashSet<Object>() );

-        super.setExtensionArtifacts( new HashSet<Object>() );

-        super.setRemoteArtifactRepositories( new LinkedList<Object>() );

-        super.setPluginArtifactRepositories( new LinkedList<Object>() );

-        super.setCollectedProjects( new LinkedList<Object>() );

-        super.setActiveProfiles( new LinkedList<Object>() );

+        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