maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slachiew...@apache.org
Subject [maven] 01/01: [MNG-5227] The 'optional' flag of a dependency should be manageable
Date Wed, 23 Jan 2019 23:56:55 GMT
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch MNG-5227
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 6502f98f5eda21862277c047fb675336a0f26b89
Author: Christian Schulte <schulte@apache.org>
AuthorDate: Wed Jan 27 03:46:11 2016 +0100

    [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.
---
 .../model/management/DefaultDependencyManagementInjector.java      | 7 -------
 1 file changed, 7 deletions(-)

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 )
         {


Mime
View raw message