You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2010/08/11 21:33:15 UTC
svn commit: r984548 -
/maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Author: jdcasey
Date: Wed Aug 11 19:33:15 2010
New Revision: 984548
URL: http://svn.apache.org/viewvc?rev=984548&view=rev
Log:
[MNG-4761] Force non-system scope to runtime, to avoid taking scope into account when doing conflict resolution for plugin dependencies.
Modified:
maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Modified: maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=984548&r1=984547&r2=984548&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Wed Aug 11 19:33:15 2010
@@ -41,6 +41,7 @@ import org.apache.maven.artifact.version
import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.model.Plugin;
+import org.apache.maven.model.Dependency;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents;
@@ -381,6 +382,14 @@ public class DefaultPluginManager
projectPlugin = plugin;
}
+ for( Dependency dependency: projectPlugin.getDependencies() )
+ {
+ if ( !Artifact.SCOPE_SYSTEM.equals( dependency.getScope() ) )
+ {
+ dependency.setScope( Artifact.SCOPE_RUNTIME );
+ }
+ }
+
Set artifacts = MavenMetadataSource.createArtifacts( artifactFactory, projectPlugin.getDependencies(), null,
null, project );