[MDEP-494] Remove/replace Maven2 specific code

Core ArtifactResolver not used anymore

git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1688075 13f79535-47bb-0310-9956-ffa450edef68

Author: rfscholte

src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java

@@ -28,7 +28,6 @@
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -61,12 +60,6 @@ public abstract class AbstractDependencyMojo
     @Component
     protected ArtifactFactory factory;
 
-    /**
-     * Used to look up Artifacts in the remote repository.
-     */
-    @Component
-    protected ArtifactResolver resolver;
-
     /**
      *
      */
@@ -400,22 +393,6 @@ public void setRemoteRepos( List<ArtifactRepository> remoteRepos )
         this.remoteRepos = remoteRepos;
     }
 
-    /**
-     * @return Returns the resolver.
-     */
-    public ArtifactResolver getResolver()
-    {
-        return this.resolver;
-    }
-
-    /**
-     * @param resolver The resolver to set.
-     */
-    public void setResolver( ArtifactResolver resolver )
-    {
-        this.resolver = resolver;
-    }
-
     /**
      * @param archiverManager The archiverManager to set.
      */

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

@@ -22,7 +22,6 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.dependency.testUtils.DependencyArtifactStubFactory;
 import org.apache.maven.plugin.dependency.testUtils.DependencyTestUtils;
@@ -83,11 +82,6 @@ protected void tearDown()
         stubFactory = null;
     }
 
-    protected void setResolver( AbstractDependencyMojo mojo, ArtifactResolver resolver )
-    {
-        mojo.resolver = resolver;
-    }
-
     protected void setSilent( AbstractDependencyMojo mojo, boolean silent )
     {
         mojo.silent = silent;

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

@@ -34,7 +34,6 @@
 import org.apache.maven.plugin.dependency.testUtils.DependencyTestUtils;
 import org.apache.maven.plugin.dependency.utils.DependencyUtil;
 import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
-import org.apache.maven.plugin.testing.stubs.StubArtifactResolver;
 import org.apache.maven.project.MavenProject;
 import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
 import org.sonatype.aether.util.DefaultRepositorySystemSession;
@@ -68,7 +67,6 @@ protected void setUp()
         // MavenProject project = mojo.getProject();
         // init classifier things
         mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
-        mojo.setResolver( new StubArtifactResolver( stubFactory, false, false ) );
 
         MavenSession session = newMavenSession( mojo.getProject() );
         setVariableValueToObject( mojo, "session", session );
@@ -564,7 +562,6 @@ public void dotestArtifactExceptions( boolean are, boolean anfe )
 
         // init classifier things
         mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
-        mojo.setResolver( new StubArtifactResolver( null, are, anfe ) );
         mojo.setLocal( new StubArtifactRepository( this.testDir.getAbsolutePath() ) );
 
         try

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

@@ -34,7 +34,6 @@
 import org.apache.maven.plugin.dependency.utils.markers.UnpackFileMarkerHandler;
 import org.apache.maven.plugin.testing.ArtifactStubFactory;
 import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
-import org.apache.maven.plugin.testing.stubs.StubArtifactResolver;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
 import org.sonatype.aether.RepositorySystem;
 import org.sonatype.aether.util.DefaultRepositorySystemSession;
@@ -78,7 +77,6 @@ protected void setUp()
         mojo.setArchiverManager( (ArchiverManager) lookup( ArchiverManager.ROLE ) );
 
         mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
-        mojo.setResolver( new StubArtifactResolver( stubFactory, false, false ) );
         mojo.setMarkersDirectory( new File( this.testDir, "markers" ) );
         mojo.setArtifactItems( list );
 

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

@@ -40,7 +40,6 @@
 import org.apache.maven.plugin.dependency.utils.markers.UnpackFileMarkerHandler;
 import org.apache.maven.plugin.testing.ArtifactStubFactory;
 import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
-import org.apache.maven.plugin.testing.stubs.StubArtifactResolver;
 import org.apache.maven.project.MavenProject;
 import org.sonatype.aether.RepositorySystem;
 import org.sonatype.aether.util.DefaultRepositorySystemSession;
@@ -79,8 +78,6 @@ protected void setUp()
             + "target/test-classes/unit/unpack-dependencies-test/test.txt" ) );
 
         mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
-        mojo.setResolver( new StubArtifactResolver( stubFactory, false, false ) );
-        // mojo.setLocal( new StubArtifactRepository( this.testDir.getAbsolutePath() ) );
         mojo.setUseJvmChmod( true );
 
         MavenSession session = newMavenSession( mojo.getProject() );
@@ -404,7 +401,6 @@ public void dotestArtifactExceptions( boolean are, boolean anfe )
 
         // init classifier things
         mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
-        mojo.setResolver( new StubArtifactResolver( null, are, anfe ) );
         mojo.setLocal( new StubArtifactRepository( this.testDir.getAbsolutePath() ) );
 
         try

src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestCopyDependenciesMojo.java

@@ -37,11 +37,9 @@
 import org.apache.maven.plugin.dependency.utils.markers.DefaultFileMarkerHandler;
 import org.apache.maven.plugin.testing.ArtifactStubFactory;
 import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
-import org.apache.maven.plugin.testing.stubs.StubArtifactResolver;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.StringUtils;
 import org.sonatype.aether.RepositorySystem;
-import org.sonatype.aether.repository.LocalRepositoryManager;
 import org.sonatype.aether.util.DefaultRepositorySystemSession;
 
 public class TestCopyDependenciesMojo
@@ -470,7 +468,6 @@ public void dotestClassifierType( String testClassifier, String testType )
 
         // init classifier things
         mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
-        mojo.setResolver( new StubArtifactResolver( stubFactory, false, false ) );
 
         mojo.execute();
 
@@ -522,7 +519,6 @@ public void dotestArtifactExceptions( boolean are, boolean anfe )
 
         // init classifier things
         mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
-        setResolver( mojo, new StubArtifactResolver( null, are, anfe ) );
         mojo.setLocal( new StubArtifactRepository( this.testDir.getAbsolutePath() ) );
 
         try
@@ -789,7 +785,6 @@ public void testCopyPom()
         throws Exception
     {
         mojo.setCopyPom( true );
-        mojo.setResolver( new StubArtifactResolver( stubFactory, false, false ) );
         mojo.setLocal( new StubArtifactRepository( this.testDir.getAbsolutePath() ) );
 
         Set<Artifact> set = new HashSet<Artifact>();

src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestUnpackDependenciesMojo.java

@@ -19,34 +19,32 @@
  * under the License.    
  */
 
-import org.apache.maven.plugin.MojoFailureException;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.LegacyLocalRepositoryManager;
 import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.dependency.AbstractDependencyMojoTestCase;
-import org.apache.maven.plugin.dependency.fromDependencies.UnpackDependenciesMojo;
 import org.apache.maven.plugin.dependency.testUtils.DependencyArtifactStubFactory;
 import org.apache.maven.plugin.dependency.testUtils.DependencyTestUtils;
 import org.apache.maven.plugin.dependency.utils.DependencyUtil;
 import org.apache.maven.plugin.dependency.utils.markers.DefaultFileMarkerHandler;
 import org.apache.maven.plugin.testing.ArtifactStubFactory;
 import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
-import org.apache.maven.plugin.testing.stubs.StubArtifactResolver;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.StringUtils;
 import org.sonatype.aether.RepositorySystem;
 import org.sonatype.aether.util.DefaultRepositorySystemSession;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
 public class TestUnpackDependenciesMojo
     extends AbstractDependencyMojoTestCase
 {
@@ -537,7 +535,6 @@ public void dotestClassifierType( String testClassifier, String testType )
         mojo.classifier = testClassifier;
         mojo.type = testType;
         mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
-        mojo.setResolver( new StubArtifactResolver( stubFactory, false, false ) );
 
         for (Artifact artifact : mojo.getProject().getArtifacts())
         {
@@ -586,7 +583,6 @@ public void dotestArtifactExceptions( boolean are, boolean anfe )
         mojo.type = "java-sources";
         // init classifier things
         mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
-        mojo.setResolver( new StubArtifactResolver( null, are, anfe ) );
         mojo.setLocal( new StubArtifactRepository( this.testDir.getAbsolutePath() ) );
 
         try