[MDEP-717] Upgrade to 3.1.1

pom.xml

@@ -89,11 +89,11 @@ under the License.
   </contributors>
 
   <properties>
-    <mavenVersion>3.0</mavenVersion>
+    <mavenVersion>3.1.1</mavenVersion>
     <doxiaVersion>1.9.1</doxiaVersion>
     <doxiaSiteVersion>1.9.2</doxiaSiteVersion>
     <jettyVersion>9.2.28.v20190418</jettyVersion>
-    <pluginTestingVersion>2.1</pluginTestingVersion>
+    <pluginTestingVersion>3.1.0</pluginTestingVersion>
     <javaVersion>7</javaVersion>
     <project.build.outputTimestamp>2020-03-07T11:40:47Z</project.build.outputTimestamp>
   </properties>
@@ -111,12 +111,6 @@ under the License.
   <dependencies>
     <!-- maven -->
     <!-- Remove once deprecated code has been replaced/removed  -->
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
@@ -268,6 +262,19 @@ under the License.
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.aether</groupId>
+      <artifactId>aether-connector-wagon</artifactId>
+      <version>0.9.0.M2</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-http-lightweight</artifactId>
+      <version>3.4.0</version>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- test -->
     <dependency>
@@ -295,24 +302,23 @@ under the License.
       <scope>test</scope>
     </dependency>
 
-   <dependency>
+    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-interpolation</artifactId>
       <version>1.26</version>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.sonatype.aether</groupId>
-      <artifactId>aether-connector-wagon</artifactId>
-      <version>1.7</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
-      <version>3.4.0</version>
-      <scope>provided</scope>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-compat</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>asm</groupId>
+          <artifactId>asm</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -391,7 +397,7 @@ under the License.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <!-- Need of more heap space in order to run the unit tests !-->
+          <!-- Need more heap space in order to run the unit tests !-->
           <argLine>-Xmx384m</argLine>
           <systemPropertyVariables>
             <maven.home>${maven.home}</maven.home>

src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java

@@ -43,6 +43,7 @@
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.plugins.dependency.utils.DependencyUtil;
 import org.apache.maven.project.MavenProjectHelper;
+import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
 import org.apache.maven.shared.transfer.repository.RepositoryManager;
 import org.codehaus.plexus.util.StringUtils;
@@ -280,7 +281,8 @@ protected void appendArtifactPath( Artifact art, StringBuilder sb )
             // substitute the property for the local repo path to make the classpath file portable.
             if ( StringUtils.isNotEmpty( localRepoProperty ) )
             {
-                File localBasedir = repositoryManager.getLocalRepositoryBasedir( session.getProjectBuildingRequest() );
+                ProjectBuildingRequest projectBuildingRequest = session.getProjectBuildingRequest();
+                File localBasedir = repositoryManager.getLocalRepositoryBasedir( projectBuildingRequest );
 
                 file = StringUtils.replace( file, localBasedir.getAbsolutePath(), localRepoProperty );
             }

src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java

@@ -23,8 +23,14 @@
 import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.maven.plugin.LegacySupport;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.repository.LocalRepositoryManager;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
 
 public abstract class AbstractDependencyMojoTestCase
@@ -76,4 +82,17 @@ protected void copyFile( AbstractDependencyMojo mojo, File artifact, File destFi
     {
         mojo.copyFile( artifact, destFile );
     }
+
+
+    protected void installLocalRepository( LegacySupport legacySupport )
+        throws ComponentLookupException
+    {
+        DefaultRepositorySystemSession repoSession =
+            (DefaultRepositorySystemSession) legacySupport.getRepositorySession();
+        RepositorySystem system = lookup( RepositorySystem.class );
+        String directory = stubFactory.getWorkingDir().toString();
+        LocalRepository localRepository = new LocalRepository( directory  );
+        LocalRepositoryManager manager = system.newLocalRepositoryManager( repoSession, localRepository );
+        repoSession.setLocalRepositoryManager( manager );
+    }
 }

src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java

@@ -41,13 +41,11 @@
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.ResourceHandler;
 import org.eclipse.jetty.util.security.Constraint;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
 
 public class TestGetMojo
     extends AbstractDependencyMojoTestCase
 {
-    GetMojo mojo;
+    private GetMojo mojo;
 
     protected void setUp()
         throws Exception
@@ -56,24 +54,22 @@ protected void setUp()
         super.setUp( "markers", false );
 
         File testPom = new File( getBasedir(), "target/test-classes/unit/get-test/plugin-config.xml" );
-        assert testPom.exists();
         mojo = (GetMojo) lookupMojo( "get", testPom );
 
         assertNotNull( mojo );
 
         LegacySupport legacySupport = lookup( LegacySupport.class );
-        MavenSession session = newMavenSession( new MavenProjectStub() );
-        Settings settings = session.getSettings();
+        MavenSession mavenSession = newMavenSession( new MavenProjectStub() );
+        Settings settings = mavenSession.getSettings();
         Server server = new Server();
         server.setId( "myserver" );
         server.setUsername( "foo" );
         server.setPassword( "bar" );
         settings.addServer( server );
-        legacySupport.setSession( session );
-        DefaultRepositorySystemSession repoSession =
-            (DefaultRepositorySystemSession) legacySupport.getRepositorySession();
-        repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( testDir.getAbsolutePath() ) );
-
+        legacySupport.setSession( mavenSession );
+
+        installLocalRepository( legacySupport );
+
         setVariableValueToObject( mojo, "session", legacySupport.getSession() );
     }
 
@@ -150,9 +146,8 @@ public void testRemoteRepositoriesAuthentication()
     public void testParseRepository()
         throws Exception
     {
-        ArtifactRepository repo;
         ArtifactRepositoryPolicy policy = null;
-        repo = mojo.parseRepository( "central::default::https://repo.maven.apache.org/maven2", policy );
+        ArtifactRepository repo = mojo.parseRepository( "central::default::https://repo.maven.apache.org/maven2", policy );
         assertEquals( "central", repo.getId() );
         assertEquals( DefaultRepositoryLayout.class, repo.getLayout().getClass() );
         assertEquals( "https://repo.maven.apache.org/maven2", repo.getUrl() );

src/test/java/org/apache/maven/plugins/dependency/TestListClassesMojo.java

@@ -24,8 +24,6 @@
 import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
 import org.apache.maven.settings.Server;
 import org.apache.maven.settings.Settings;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
 
 import java.io.File;
 
@@ -37,10 +35,10 @@ public class TestListClassesMojo
     protected void setUp()
             throws Exception
     {
-        // required for mojo lookups to work
         super.setUp( "markers", false );
-
         File testPom = new File( getBasedir(), "target/test-classes/unit/get-test/plugin-config.xml" );
+
+        assertTrue( testPom.exists() );
         mojo = (ListClassesMojo) lookupMojo( "list-classes", testPom );
 
         assertNotNull( mojo );
@@ -54,9 +52,8 @@ protected void setUp()
         server.setPassword( "bar" );
         settings.addServer( server );
         legacySupport.setSession( session );
-        DefaultRepositorySystemSession repoSession =
-                (DefaultRepositorySystemSession) legacySupport.getRepositorySession();
-        repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( testDir.getAbsolutePath() ) );
+
+        installLocalRepository( legacySupport );
 
         setVariableValueToObject( mojo, "session", legacySupport.getSession() );
     }

src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java

@@ -29,22 +29,16 @@
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
+import org.apache.maven.plugin.LegacySupport;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
 import org.apache.maven.plugins.dependency.utils.DependencyUtil;
 import org.apache.maven.project.MavenProject;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
 
 public class TestCopyMojo
     extends AbstractDependencyMojoTestCase
 {
-    CopyMojo mojo;
-
-    public TestCopyMojo()
-    {
-        super();
-    }
+    private CopyMojo mojo;
 
     protected void setUp()
         throws Exception
@@ -58,18 +52,16 @@ protected void setUp()
 
         assertNotNull( mojo );
         assertNotNull( mojo.getProject() );
-        // MavenProject project = mojo.getProject();
-        // init classifier things
 
         MavenSession session = newMavenSession( mojo.getProject() );
         setVariableValueToObject( mojo, "session", session );
 
-        DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
-
-        repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
+        LegacySupport legacySupport = lookup( LegacySupport.class );
+        legacySupport.setSession( session );
+        installLocalRepository( legacySupport );
     }
 
-    public ArtifactItem getSingleArtifactItem( boolean removeVersion, boolean useBaseVersion )
+    private ArtifactItem getSingleArtifactItem( boolean removeVersion, boolean useBaseVersion )
         throws MojoExecutionException
     {
         List<ArtifactItem> list =

src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java

@@ -26,12 +26,11 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.LegacySupport;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
 import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
 
 public class TestIncludeExcludeUnpackMojo
     extends AbstractDependencyMojoTestCase
@@ -44,7 +43,7 @@ public class TestIncludeExcludeUnpackMojo
 
     private final String PACKED_FILE_PATH = "target/test-classes/unit/unpack-dependencies-test/" + PACKED_FILE;
 
-    UnpackMojo mojo;
+    private UnpackMojo mojo;
 
     protected void setUp()
         throws Exception
@@ -77,9 +76,9 @@ protected void setUp()
         MavenSession session = newMavenSession( mojo.getProject() );
         setVariableValueToObject( mojo, "session", session );
 
-        DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
-
-        repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
+        LegacySupport legacySupport = lookup( LegacySupport.class );
+        legacySupport.setSession( session );
+        installLocalRepository( legacySupport );
     }
 
     protected void tearDown()

src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java

@@ -23,13 +23,12 @@
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
+import org.apache.maven.plugin.LegacySupport;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
 import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
 import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
 import org.apache.maven.project.MavenProject;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
 
 import java.io.File;
 import java.io.IOException;
@@ -45,11 +44,6 @@ public class TestUnpackMojo
 
     UnpackMojo mojo;
 
-    public TestUnpackMojo()
-    {
-        super();
-    }
-
     protected void setUp()
         throws Exception
     {
@@ -77,9 +71,10 @@ protected void setUp()
         MavenSession session = newMavenSession( mojo.getProject() );
         setVariableValueToObject( mojo, "session", session );
 
-        DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
+        LegacySupport legacySupport = lookup( LegacySupport.class );
 
-        repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
+        legacySupport.setSession( session );
+        installLocalRepository( legacySupport );
     }
 
     public ArtifactItem getSingleArtifactItem( boolean removeVersion )