Author: rfscholte
Date: Mon Jun 22 20:50:30 2015
New Revision: 1686934
URL: http://svn.apache.org/r1686934
Log:
[MDEP-494] Push down ArtifactCollector to ListRepositoriesMojo, that's the only
one using it. Also simplifies unittests a bit.
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.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
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=1686934&r1=1686933&r2=1686934&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
Mon Jun 22 20:50:30 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.ArtifactCollector;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
@@ -69,12 +68,6 @@ public abstract class AbstractDependency
protected ArtifactResolver resolver;
/**
- * Artifact collector, needed to resolve dependencies.
- */
- @Component( role = ArtifactCollector.class )
- protected ArtifactCollector artifactCollector;
-
- /**
*
*/
@Component( role = ArtifactMetadataSource.class, hint = "maven" )
@@ -432,22 +425,6 @@ public abstract class AbstractDependency
}
/**
- * @return Returns the artifactCollector.
- */
- public ArtifactCollector getArtifactCollector()
- {
- return this.artifactCollector;
- }
-
- /**
- * @param theArtifactCollector The artifactCollector to set.
- */
- public void setArtifactCollector( ArtifactCollector theArtifactCollector )
- {
- this.artifactCollector = theArtifactCollector;
- }
-
- /**
* @return Returns the artifactMetadataSource.
*/
public ArtifactMetadataSource getArtifactMetadataSource()
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java?rev=1686934&r1=1686933&r2=1686934&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
Mon Jun 22 20:50:30 2015
@@ -21,12 +21,14 @@ package org.apache.maven.plugin.dependen
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactCollector;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ResolutionListener;
import org.apache.maven.artifact.resolver.ResolutionNode;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.AbstractDependencyMojo;
+import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.shared.artifact.filter.ScopeArtifactFilter;
@@ -48,6 +50,12 @@ public class ListRepositoriesMojo
extends AbstractDependencyMojo
{
/**
+ * Artifact collector, needed to resolve dependencies.
+ */
+ @Component( role = ArtifactCollector.class )
+ private ArtifactCollector artifactCollector;
+
+ /**
* Displays a list of the repositories used by this build.
*
* @throws MojoExecutionException with a message if an error occurs.
@@ -81,4 +89,21 @@ public class ListRepositoriesMojo
throw new MojoExecutionException( "Unable to resolve artifacts", e
);
}
}
+
+
+ /**
+ * @return Returns the artifactCollector.
+ */
+ public ArtifactCollector getArtifactCollector()
+ {
+ return this.artifactCollector;
+ }
+
+ /**
+ * @param theArtifactCollector The artifactCollector to set.
+ */
+ public void setArtifactCollector( ArtifactCollector theArtifactCollector )
+ {
+ this.artifactCollector = theArtifactCollector;
+ }
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java?rev=1686934&r1=1686933&r2=1686934&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
Mon Jun 22 20:50:30 2015
@@ -159,7 +159,6 @@ public class ResolvePluginsMojo
* @throws ArtifactNotFoundException
* @throws ArtifactFilterException
*/
- @SuppressWarnings( "unchecked" )
protected Set<Artifact> resolvePluginArtifacts()
throws ArtifactResolutionException, ArtifactNotFoundException,
ArtifactFilterException
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java?rev=1686934&r1=1686933&r2=1686934&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java
Mon Jun 22 20:50:30 2015
@@ -466,7 +466,6 @@ public class TreeMojo
ArtifactVersion recommendedVersion =
allowedRange.getRecommendedVersion();
if ( recommendedVersion == null )
{
- @SuppressWarnings( "unchecked" )
List<Restriction> restrictions = allowedRange.getRestrictions();
for ( Restriction restriction : restrictions )
{
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=1686934&r1=1686933&r2=1686934&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
Mon Jun 22 20:50:30 2015
@@ -64,8 +64,6 @@ public class TestCopyMojo
mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
mojo.setResolver( new StubArtifactResolver( stubFactory, false, false
) );
mojo.setLocal( new StubArtifactRepository(
this.testDir.getAbsolutePath() ) );
- mojo.setArtifactCollector( new StubArtifactCollector() );
-
}
public ArtifactItem getSingleArtifactItem( boolean removeVersion, boolean
useBaseVersion )
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=1686934&r1=1686933&r2=1686934&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
Mon Jun 22 20:50:30 2015
@@ -76,7 +76,6 @@ public class TestIncludeExcludeUnpackMoj
mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
mojo.setResolver( new StubArtifactResolver( stubFactory, false, false
) );
mojo.setMarkersDirectory( new File( this.testDir, "markers" ) );
- mojo.setArtifactCollector( new StubArtifactCollector() );
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=1686934&r1=1686933&r2=1686934&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
Mon Jun 22 20:50:30 2015
@@ -76,7 +76,6 @@ public class TestUnpackMojo
mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
mojo.setResolver( new StubArtifactResolver( stubFactory, false, false
) );
mojo.setLocal( new StubArtifactRepository(
this.testDir.getAbsolutePath() ) );
- mojo.setArtifactCollector( new StubArtifactCollector() );
mojo.setUseJvmChmod( true );
}
