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 2009/02/22 22:00:18 UTC
svn commit: r746818 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Author: bentmann
Date: Sun Feb 22 21:00:18 2009
New Revision: 746818
URL: http://svn.apache.org/viewvc?rev=746818&view=rev
Log:
o Fixed dependency resolution (the dependency artifacts are cached so we can't employ the scope filter here)
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=746818&r1=746817&r2=746818&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Sun Feb 22 21:00:18 2009
@@ -1478,8 +1478,6 @@
throws ArtifactResolutionException, ArtifactNotFoundException,
InvalidDependencyVersionException
{
- ArtifactFilter filter = new ScopeArtifactFilter( scope );
-
// TODO: such a call in MavenMetadataSource too - packaging not really the intention of type
Artifact artifact = repositoryTools.createBuildArtifact( project.getGroupId(),
project.getArtifactId(),
@@ -1492,9 +1490,11 @@
if ( project.getDependencyArtifacts() == null )
{
// NOTE: Don't worry about covering this case with the error-reporter bindings...it's already handled by the project error reporter.
- project.setDependencyArtifacts( repositoryTools.createArtifacts( project.getDependencies(), null, filter, project ) );
+ project.setDependencyArtifacts( repositoryTools.createArtifacts( project.getDependencies(), null, null, project ) );
}
+ ArtifactFilter filter = new ScopeArtifactFilter( scope );
+
Set resolvedArtifacts;
try
{