svn commit: r1687968 - /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java

[rfscholte]

Author: rfscholte
Date: Sat Jun 27 21:56:08 2015
New Revision: 1687968

URL: http://svn.apache.org/r1687968
Log:
[MDEP-494] Remove/replace Maven2 specific code
goals extending AbstractDependencyFilterMojo are now using ArtifactResolver 
from maven-artifact-transfer

Modified:
    
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java?rev=1687968&r1=1687967&r2=1687968&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
 Sat Jun 27 21:56:08 2015
@@ -25,8 +25,6 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.dependency.AbstractDependencyMojo;
 import org.apache.maven.plugin.dependency.utils.DependencyStatusSets;
@@ -52,6 +50,7 @@ import org.apache.maven.shared.artifact.
 import org.apache.maven.shared.artifact.filter.collection.ScopeFilter;
 import org.apache.maven.shared.artifact.filter.collection.TypeFilter;
 import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
+import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
@@ -353,20 +352,25 @@ public abstract class AbstractDependency
         {
             project = project.getParent();
 
-            if ( !artifacts.add( project.getArtifact() ) )
+            if ( artifacts.contains( project.getArtifact() ) )
             {
                 // artifact already in the set
                 break;
             }
             try
             {
-                resolver.resolve( project.getArtifact(), this.remoteRepos, 
this.getLocal() );
+                ProjectBuildingRequest buildingRequest =
+                    new DefaultProjectBuildingRequest( 
session.getProjectBuildingRequest() );
+                
+                buildingRequest.setLocalRepository( this.getLocal() );
+                
+                buildingRequest.setRemoteRepositories( this.remoteRepos );
+                
+                Artifact resolvedArtifact = artifactResolver.resolveArtifact( 
buildingRequest, project.getArtifact() );
+                
+                artifacts.add( resolvedArtifact );
             }
-            catch ( ArtifactResolutionException e )
-            {
-                throw new MojoExecutionException( e.getMessage(), e );
-            }
-            catch ( ArtifactNotFoundException e )
+            catch ( ArtifactResolverException e )
             {
                 throw new MojoExecutionException( e.getMessage(), e );
             }