mirror of https://github.com/apache/maven.git
o Fixed resolution of system-scope plugin dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@752094 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
243d2cd6f7
commit
e13ca66b7b
|
@ -16,6 +16,7 @@ package org.apache.maven.plugin;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.StringReader;
|
import java.io.StringReader;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -382,7 +383,14 @@ public class DefaultPluginManager
|
||||||
// This needs to be changed so that the resolver deals with this
|
// This needs to be changed so that the resolver deals with this
|
||||||
for ( Dependency d : pluginProject.getDependencies() )
|
for ( Dependency d : pluginProject.getDependencies() )
|
||||||
{
|
{
|
||||||
pluginArtifacts.add( repositorySystem.createArtifact( d.getGroupId(), d.getArtifactId(), d.getVersion(), d.getScope(), d.getType() ) );
|
Artifact dependencyArtifact =
|
||||||
|
repositorySystem.createArtifact( d.getGroupId(), d.getArtifactId(), d.getVersion(), d.getScope(),
|
||||||
|
d.getType() );
|
||||||
|
if ( Artifact.SCOPE_SYSTEM.equals( dependencyArtifact.getScope() ) )
|
||||||
|
{
|
||||||
|
dependencyArtifact.setFile( new File( d.getSystemPath() ) );
|
||||||
|
}
|
||||||
|
pluginArtifacts.add( dependencyArtifact );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( pluginProject != null )
|
if ( pluginProject != null )
|
||||||
|
|
Loading…
Reference in New Issue