Repository: maven Updated Branches: refs/heads/DEPMGMT f99ff62f0 -> d8d67e6a7 (forced update)
[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. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c2e631ff Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c2e631ff Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c2e631ff Branch: refs/heads/DEPMGMT Commit: c2e631ff276138c57e994e18bc84a4bf3155b79c Parents: a98321e Author: Christian Schulte <schu...@apache.org> Authored: Wed Jan 27 03:46:11 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Mar 8 19:46:53 2017 +0100 ---------------------------------------------------------------------- .../model/management/DefaultDependencyManagementInjector.java | 7 ------- 1 file changed, 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/c2e631ff/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 e611973..731cdd8 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 @@ -82,13 +82,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 ) {
