Author: rfscholte
Date: Sun Jun 28 21:46:54 2015
New Revision: 1688075
URL: http://svn.apache.org/r1688075
Log:
[MDEP-494] Remove/replace Maven2 specific code
Core ArtifactResolver not used anymore
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/AbstractDependencyMojoTestCase.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestCopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestUnpackDependenciesMojo.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java?rev=1688075&r1=1688074&r2=1688075&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
Sun Jun 28 21:46:54 2015
@@ -28,7 +28,6 @@ import org.apache.maven.artifact.Artifac
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;
@@ -62,12 +61,6 @@ public abstract class AbstractDependency
protected ArtifactFactory factory;
/**
- * Used to look up Artifacts in the remote repository.
- */
- @Component
- protected ArtifactResolver resolver;
-
- /**
*
*/
@Component( role = ArtifactMetadataSource.class, hint = "maven" )
@@ -401,22 +394,6 @@ public abstract class AbstractDependency
}
/**
- * @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.
*/
public void setArchiverManager( ArchiverManager archiverManager )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/AbstractDependencyMojoTestCase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/AbstractDependencyMojoTestCase.java?rev=1688075&r1=1688074&r2=1688075&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/AbstractDependencyMojoTestCase.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/AbstractDependencyMojoTestCase.java
Sun Jun 28 21:46:54 2015
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.dependen
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 @@ public abstract class AbstractDependency
stubFactory = null;
}
- protected void setResolver( AbstractDependencyMojo mojo, ArtifactResolver
resolver )
- {
- mojo.resolver = resolver;
- }
-
protected void setSilent( AbstractDependencyMojo mojo, boolean silent )
{
mojo.silent = silent;
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java?rev=1688075&r1=1688074&r2=1688075&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java
Sun Jun 28 21:46:54 2015
@@ -34,7 +34,6 @@ import org.apache.maven.plugin.dependenc
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 @@ public class TestCopyMojo
// 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 class TestCopyMojo
// init classifier things
mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
- mojo.setResolver( new StubArtifactResolver( null, are, anfe ) );
mojo.setLocal( new StubArtifactRepository(
this.testDir.getAbsolutePath() ) );
try
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java?rev=1688075&r1=1688074&r2=1688075&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
Sun Jun 28 21:46:54 2015
@@ -34,7 +34,6 @@ import org.apache.maven.plugin.dependenc
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 @@ public class TestIncludeExcludeUnpackMoj
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 );
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java?rev=1688075&r1=1688074&r2=1688075&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
Sun Jun 28 21:46:54 2015
@@ -40,7 +40,6 @@ import org.apache.maven.plugin.dependenc
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 @@ public class TestUnpackMojo
+ "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 class TestUnpackMojo
// init classifier things
mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
- mojo.setResolver( new StubArtifactResolver( null, are, anfe ) );
mojo.setLocal( new StubArtifactRepository(
this.testDir.getAbsolutePath() ) );
try
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestCopyDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestCopyDependenciesMojo.java?rev=1688075&r1=1688074&r2=1688075&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestCopyDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestCopyDependenciesMojo.java
Sun Jun 28 21:46:54 2015
@@ -37,11 +37,9 @@ import org.apache.maven.plugin.dependenc
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 class TestCopyDependenciesMojo
// init classifier things
mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
- mojo.setResolver( new StubArtifactResolver( stubFactory, false, false
) );
mojo.execute();
@@ -522,7 +519,6 @@ public class TestCopyDependenciesMojo
// 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 class TestCopyDependenciesMojo
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>();
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestUnpackDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestUnpackDependenciesMojo.java?rev=1688075&r1=1688074&r2=1688075&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestUnpackDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestUnpackDependenciesMojo.java
Sun Jun 28 21:46:54 2015
@@ -19,7 +19,12 @@ package org.apache.maven.plugin.dependen
* 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;
@@ -27,26 +32,19 @@ import org.apache.maven.artifact.resolve
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 class TestUnpackDependenciesMojo
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 class TestUnpackDependenciesMojo
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
