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/01/28 17:40:38 UTC
maven git commit: [MNG-5227] The 'optional' flag of a dependency
should be manageable.
Repository: maven
Updated Branches:
refs/heads/master e37117e30 -> cde5b291e
[MNG-5227] The 'optional' flag of a dependency should be manageable.
o Updated to include debug information about optionality management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cde5b291
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cde5b291
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cde5b291
Branch: refs/heads/master
Commit: cde5b291ea0e4090f873f9fd4ab834e2439c2597
Parents: e37117e
Author: Christian Schulte <sc...@apache.org>
Authored: Thu Jan 28 17:39:13 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Thu Jan 28 17:39:13 2016 +0100
----------------------------------------------------------------------
.../maven/project/DefaultProjectDependenciesResolver.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/cde5b291/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 01f30df..529a63c 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
{