Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5D08D200C0D for ; Tue, 31 Jan 2017 23:09:55 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5BEC6160B36; Tue, 31 Jan 2017 22:09:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 60B86160B66 for ; Tue, 31 Jan 2017 23:09:54 +0100 (CET) Received: (qmail 29386 invoked by uid 500); 31 Jan 2017 22:09:52 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 28227 invoked by uid 99); 31 Jan 2017 22:09:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 Jan 2017 22:09:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E9334DFC61; Tue, 31 Jan 2017 22:09:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: schulte@apache.org To: commits@maven.apache.org Date: Tue, 31 Jan 2017 22:10:02 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/17] maven git commit: [MNG-5227] The 'optional' flag of a dependency should be manageable. archived-at: Tue, 31 Jan 2017 22:09:55 -0000 [MNG-5227] The 'optional' flag of a dependency should be manageable. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f05b4e00 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f05b4e00 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f05b4e00 Branch: refs/heads/DEPMGMT-IT Commit: f05b4e00f170dc4f0159abb98ffdab5869786069 Parents: 0b90b27 Author: Christian Schulte Authored: Wed Jan 27 03:46:11 2016 +0100 Committer: Christian Schulte Committed: Tue Jan 31 23:09:10 2017 +0100 ---------------------------------------------------------------------- .../maven/project/DefaultProjectDependenciesResolver.java | 8 ++++++++ .../management/DefaultDependencyManagementInjector.java | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/f05b4e00/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java index 50c9e35..7f2f902 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java @@ -273,6 +273,14 @@ public class DefaultProjectDependenciesResolver appendManagementSource( buffer, art, "version" ); buffer.append( ")" ); } + + Boolean premanagedOptional = DependencyManagerUtils.getPremanagedOptional( node ); + if ( premanagedOptional != null && !premanagedOptional.equals( dep.getOptional() ) ) + { + buffer.append( " (optionality managed from " ).append( premanagedOptional ); + appendManagementSource( buffer, art, "optional" ); + buffer.append( ')' ); + } } else { http://git-wip-us.apache.org/repos/asf/maven/blob/f05b4e00/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 context ) - { - // optional flag is not managed - } - - @Override protected void mergeDependency_Exclusions( Dependency target, Dependency source, boolean sourceDominant, Map context ) {