Author: rfscholte
Date: Sat Jul 25 10:05:31 2015
New Revision: 1692616
URL: http://svn.apache.org/r1692616
Log:
[MDEP-494] Remove/replace Maven2 specific code
Split resolving of the artifact and its dependencies.
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java?rev=1692616&r1=1692615&r2=1692616&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
Sat Jul 25 10:05:31 2015
@@ -21,7 +21,6 @@ package org.apache.maven.plugins.depende
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
@@ -202,16 +201,21 @@ public class GetMojo
new DefaultProjectBuildingRequest(
session.getProjectBuildingRequest() );
buildingRequest.setRemoteRepositories( repoList );
-
+
if ( transitive )
{
getLog().info( "Resolving " + coordinate + " with transitive
dependencies" );
- artifactResolver.resolveDependencies( buildingRequest,
Collections.singletonList( coordinate ), null );
}
else
{
getLog().info( "Resolving " + coordinate );
- artifactResolver.resolveArtifact( buildingRequest, coordinate
);
+ }
+
+ artifactResolver.resolveArtifact( buildingRequest, coordinate );
+
+ if ( transitive )
+ {
+ artifactResolver.resolveDependencies( buildingRequest,
coordinate, null );
}
}
catch ( ArtifactResolverException e )
