Repository: maven Updated Branches: refs/heads/master 644ac9c40 -> 335531865
[MNG-5227] The 'optional' flag of a dependency should be manageable. This reverts commit 2fb5fd5e6b7ebded597329d1e87e255fb368ba73. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0931a8fe Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0931a8fe Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0931a8fe Branch: refs/heads/master Commit: 0931a8fe0aa43a95a34d7dacb5050df6746c1b55 Parents: 644ac9c Author: Christian Schulte <schu...@apache.org> Authored: Sun Jun 12 16:46:43 2016 +0200 Committer: Christian Schulte <schu...@apache.org> Committed: Sun Jun 12 16:46:43 2016 +0200 ---------------------------------------------------------------------- .../model/management/DefaultDependencyManagementInjector.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/0931a8fe/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 731cdd8..e611973 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,6 +82,13 @@ 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 ) {
