This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MNG-5227 in repository https://gitbox.apache.org/repos/asf/maven.git
commit 08fe5e07b2468d1eb5b3efd17c22638effc8aa28 Author: Christian Schulte <[email protected]> AuthorDate: Wed Jan 27 03:46:11 2016 +0100 [MNG-5227] The 'optional' flag of a dependency should be manageable. o Updated to add missing management of the optional flag to the ModelBuilder. The Maven resolver has been managing the optional flag since years. This just adds the missing parts to the ModelBuilder to make optional flag management consistent when building the effective model no matter if resolved or if build. --- .../model/management/DefaultDependencyManagementInjector.java | 7 ------- 1 file changed, 7 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 499f355..dc33853 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 @@ -89,13 +89,6 @@ public class DefaultDependencyManagementInjector } @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 ) {
