You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/07/12 18:57:27 UTC
svn commit: r1752326 -
/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
Author: rfscholte
Date: Tue Jul 12 18:57:27 2016
New Revision: 1752326
URL: http://svn.apache.org/viewvc?rev=1752326&view=rev
Log:
Use new version of DependencyResolver#resolveDependencies
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java?rev=1752326&r1=1752325&r2=1752326&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java Tue Jul 12 18:57:27 2016
@@ -51,7 +51,6 @@ import org.apache.maven.shared.artifact.
import org.apache.maven.shared.artifact.filter.resolve.transform.ArtifactIncludeFilterTransformer;
import org.apache.maven.shared.artifact.resolve.ArtifactResult;
import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
-import org.apache.maven.shared.project.DefaultProjectCoordinate;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -336,15 +335,8 @@ public class DefaultDependencyResolver
{
try
{
- DefaultProjectCoordinate coordinate = new DefaultProjectCoordinate();
- coordinate.setGroupId( project.getGroupId() );
- coordinate.setArtifactId( project.getArtifactId() );
- coordinate.setVersion( project.getVersion() );
- coordinate.setPackaging( project.getPackaging() );
-
-
Iterable<ArtifactResult> artifactResults =
- dependencyResolver.resolveDependencies( buildingRequest, coordinate, scopeFilter );
+ dependencyResolver.resolveDependencies( buildingRequest, project.getModel(), scopeFilter );
dependencyArtifacts = new HashSet<Artifact>();