You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2017/05/10 20:12:42 UTC
maven git commit: [MNG-5227] The 'optional' flag of a dependency
should be manageable
Repository: maven
Updated Branches:
refs/heads/MNG-5227 [created] 0105c697f
[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/0105c697
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0105c697
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0105c697
Branch: refs/heads/MNG-5227
Commit: 0105c697f215a3dc79344f8f262b862da731cf2d
Parents: f4ede96
Author: Christian Schulte <sc...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Wed May 10 16:22:16 2017 +0200
----------------------------------------------------------------------
.../model/management/DefaultDependencyManagementInjector.java | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0105c697/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 )
{