Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't inherit test deps 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@314948 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-12 15:27:52 +00:00
parent e8540568ae
commit 608c1ebb93
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
maven-mboot2/src/main/java/model/ModelReader.java
View File

@ -164,8 +164,8 @@ public class ModelReader
}
else if ( rawName.equals( "dependency" ) )
{
List chain = Collections.singletonList(
new Dependency( groupId, artifactId, version, packaging, this.chain ) );
List chain =
Collections.singletonList( new Dependency( groupId, artifactId, version, packaging, this.chain ) );
currentDependency = new Dependency( chain );
insideDependency = true;
@ -245,8 +245,8 @@ public class ModelReader
}
// actually, these should be transtive (see MNG-77) - but some projects have circular deps that way
ModelReader p = retrievePom( parentGroupId, parentArtifactId, parentVersion, "pom", false,
excluded, Collections.EMPTY_LIST );
ModelReader p = retrievePom( parentGroupId, parentArtifactId, parentVersion, "pom", false, excluded,
Collections.EMPTY_LIST );
addDependencies( p.getDependencies(), parentDependencies, null, excluded );
@ -473,20 +473,24 @@ public class ModelReader
{
Dependency d = (Dependency) i.next();
// Do we care about runtime here?
if ( Dependency.SCOPE_TEST.equals( inheritedScope ) )
// skip test deps
if ( !Dependency.SCOPE_TEST.equals( d.getScope() ) )
{
d.setScope( Dependency.SCOPE_TEST );
}
if ( !hasDependency( d, target ) && !excluded.contains( d.getConflictId() ) )
{
if ( "plexus".equals( d.getGroupId() ) && ( "plexus-utils".equals( d.getArtifactId() ) ||
"plexus-container-default".equals( d.getArtifactId() ) ) )
// Do we care about runtime here?
if ( Dependency.SCOPE_TEST.equals( inheritedScope ) )
{
throw new IllegalStateException( d.getConflictId() + " found in chain " + d.getChain() );
d.setScope( Dependency.SCOPE_TEST );
}
if ( !hasDependency( d, target ) && !excluded.contains( d.getConflictId() ) )
{
if ( "plexus".equals( d.getGroupId() ) && ( "plexus-utils".equals( d.getArtifactId() ) ||
"plexus-container-default".equals( d.getArtifactId() ) ) )
{
throw new IllegalStateException( d.getConflictId() + " found in chain " + d.getChain() );
}
target.put( d.getConflictId(), d );
}
target.put( d.getConflictId(), d );
}
}
}