use managed versions when resolving project dependencies from the plugin manager before executing a mojo, and include system path in system-scoped artifacts within the managed version map.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@588326 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2007-10-25 19:58:14 +00:00
parent b0cc7be1ac
commit bcb1ebe0e0
2 changed files with 8 additions and 3 deletions

View File

@ -1385,7 +1385,7 @@ public class DefaultPluginManager
ArtifactResolutionResult result = artifactResolver.resolveTransitively(
project.getDependencyArtifacts(),
artifact,
Collections.EMPTY_MAP,
project.getManagedVersionMap(),
context.getLocalRepository(),
project.getRemoteArtifactRepositories(),
artifactMetadataSource,

View File

@ -340,6 +340,11 @@ public class DefaultMavenProjectBuilder
Artifact artifact = artifactFactory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(), versionRange, d.getType(),
d.getClassifier(), d.getScope(), d.isOptional() );
if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) && ( d.getSystemPath() != null ) )
{
artifact.setFile( new File( d.getSystemPath() ) );
}
if ( getLogger().isDebugEnabled() )
{
getLogger().debug( " " + artifact );