From 699fc5b81d789ce503b3324970df06e30a06968b Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Fri, 19 Mar 2010 23:20:31 +0000 Subject: [PATCH] [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 --- .../DefaultDependencyManagementInjector.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java index 9edc788ac2..fbfd4b8132 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java @@ -80,6 +80,13 @@ public void mergeManagedDependencies( Model model ) } } + @Override + protected void mergeDependency_Optional( Dependency target, Dependency source, boolean sourceDominant, + Map context ) + { + // optional flag is not managed + } + @Override protected void mergeDependency_Exclusions( Dependency target, Dependency source, boolean sourceDominant, Map 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 ); } }