You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/08/05 19:02:24 UTC
svn commit: r982696 -
/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
Author: bentmann
Date: Thu Aug 5 17:02:24 2010
New Revision: 982696
URL: http://svn.apache.org/viewvc?rev=982696&view=rev
Log:
[MNG-4750] [regression] MavenProject.getDependencyArtifacts() aren't resolved
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java?rev=982696&r1=982695&r2=982696&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java Thu Aug 5 17:02:24 2010
@@ -122,12 +122,6 @@ public class LifecycleDependencyResolver
boolean aggregating, Set<Artifact> projectArtifacts )
throws LifecycleExecutionException
{
- Set<Artifact> artifacts =
- getProjectDependencies( project, scopesToCollect, scopesToResolve, session, aggregating,
- projectArtifacts );
-
- project.setResolvedArtifacts( artifacts );
-
if ( project.getDependencyArtifacts() == null )
{
try
@@ -139,6 +133,12 @@ public class LifecycleDependencyResolver
throw new LifecycleExecutionException( e );
}
}
+
+ Set<Artifact> artifacts =
+ getProjectDependencies( project, scopesToCollect, scopesToResolve, session, aggregating,
+ projectArtifacts );
+
+ project.setResolvedArtifacts( artifacts );
}
private Set<Artifact> getProjectDependencies( MavenProject project, Collection<String> scopesToCollect,