You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/06/16 18:42:06 UTC
maven git commit: [MNG-5227] The 'optional' flag of a dependency
should be manageable.
Repository: maven
Updated Branches:
refs/heads/master 7e1b961ed -> 09bfdee69
[MNG-5227] The 'optional' flag of a dependency should be manageable.
o This reverts commit 0931a8fe0aa43a95a34d7dacb5050df6746c1b55.
It is better to have this in Maven 3.4 which will be released with an Aether
version not supporting this feature correctly. In 3.5 we will be using an
updated Aether version with bugfixes to resolution issues which will make
this start working. The confusion about this feature is the Aether
bugfixes needed to make it work as expected, not the feature itself.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/09bfdee6
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/09bfdee6
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/09bfdee6
Branch: refs/heads/master
Commit: 09bfdee699443b2482d2427b5eff7226768b340a
Parents: 7e1b961
Author: Christian Schulte <sc...@apache.org>
Authored: Thu Jun 16 20:31:51 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Thu Jun 16 20:38:49 2016 +0200
----------------------------------------------------------------------
.../model/management/DefaultDependencyManagementInjector.java | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/09bfdee6/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 )
{