[MNG-5227] The 'optional' flag of a dependency should be manageable Updated to add missing management of the optional flag to the ModelBuilder. The Maven Resolver has been managing the optional flag for 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 built.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8a6ecb1c Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8a6ecb1c Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8a6ecb1c Branch: refs/heads/MNG-5227 Commit: 8a6ecb1c1a4805c5f6484930deec6ab03ea8fc5f Parents: cd34b08 Author: Christian Schulte <schu...@apache.org> Authored: Wed Jan 27 03:46:11 2016 +0100 Committer: Karl Heinz Marbaise <khmarba...@apache.org> Committed: Sat Feb 17 21:28:47 2018 +0100 ---------------------------------------------------------------------- .../model/management/DefaultDependencyManagementInjector.java | 7 ------- 1 file changed, 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/8a6ecb1c/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java ---------------------------------------------------------------------- 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 4547407..510c4cc 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 @@ -86,13 +86,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 ) {
