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

[MNG-4600] [regression] Optional flag from dependency management applied to dependencies 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@925481 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-03-19 23:20:31 +00:00
parent a1f22c3da7
commit 699fc5b81d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
View File

@ -80,6 +80,13 @@ public void mergeManagedDependencies( Model model )
}
}
@Override
protected void mergeDependency_Optional( Dependency target, Dependency source, boolean sourceDominant,
Map<Object, Object> context )
{
// optional flag is not managed
}
@Override
protected void mergeDependency_Exclusions( Dependency target, Dependency source, boolean sourceDominant,
Map<Object, Object> context )
@ -91,8 +98,7 @@ protected void mergeDependency_Exclusions( Dependency target, Dependency source,
for ( Exclusion element : src )
{
Exclusion clone = new Exclusion();
mergeExclusion( clone, element, true, context );
Exclusion clone = element.clone();
target.addExclusion( clone );
}
}