You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/03/20 00:20:31 UTC
svn commit: r925481 -
/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
Author: bentmann
Date: Fri Mar 19 23:20:31 2010
New Revision: 925481
URL: http://svn.apache.org/viewvc?rev=925481&view=rev
Log:
[MNG-4600] [regression] Optional flag from dependency management applied to dependencies
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java?rev=925481&r1=925480&r2=925481&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java Fri Mar 19 23:20:31 2010
@@ -81,6 +81,13 @@ public class DefaultDependencyManagement
}
@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 @@ public class DefaultDependencyManagement
for ( Exclusion element : src )
{
- Exclusion clone = new Exclusion();
- mergeExclusion( clone, element, true, context );
+ Exclusion clone = element.clone();
target.addExclusion( clone );
}
}