[MNG-4761] Force non-system scope to runtime, to avoid taking scope into account when doing conflict resolution for plugin dependencies.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-2/branches/maven-2.2.x@984548 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/21cffe1b Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/21cffe1b Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/21cffe1b Branch: refs/heads/maven-2.2.x Commit: 21cffe1b9f66038787d312c2f8459a431070a9bd Parents: 920bac0 Author: John Dennis Casey <jdca...@apache.org> Authored: Wed Aug 11 19:33:15 2010 +0000 Committer: John Dennis Casey <jdca...@apache.org> Committed: Wed Aug 11 19:33:15 2010 +0000 ---------------------------------------------------------------------- .../apache/maven/plugin/DefaultPluginManager.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/21cffe1b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java index 67ab0c3..6a33fcc 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java @@ -41,6 +41,7 @@ import org.apache.maven.artifact.versioning.VersionRange; 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 );
