[2/3] maven git commit: [MNG-6183] Dependency management debug message enhancements.
[MNG-6183] Dependency management debug message enhancements. o Updated to add debug log messages about optional flag management. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34afec69 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/34afec69 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/34afec69 Branch: refs/heads/MNG-6057 Commit: 34afec69c866f731f3f9d9b3606bbc31b51d64e7 Parents: ab800b0 Author: Christian SchulteAuthored: Wed Jan 27 03:46:11 2016 +0100 Committer: Christian Schulte Committed: Wed Mar 8 19:37:31 2017 +0100 -- .../maven/project/DefaultProjectDependenciesResolver.java| 8 1 file changed, 8 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/34afec69/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 16b60c2..21dfaa2 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 {
[2/3] maven git commit: [MNG-6183] Dependency management debug message enhancements.
[MNG-6183] Dependency management debug message enhancements. o Updated to add debug log messages about optional flag management. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34afec69 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/34afec69 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/34afec69 Branch: refs/heads/MNG-6164 Commit: 34afec69c866f731f3f9d9b3606bbc31b51d64e7 Parents: ab800b0 Author: Christian SchulteAuthored: Wed Jan 27 03:46:11 2016 +0100 Committer: Christian Schulte Committed: Wed Mar 8 19:37:31 2017 +0100 -- .../maven/project/DefaultProjectDependenciesResolver.java| 8 1 file changed, 8 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/34afec69/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 16b60c2..21dfaa2 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 {
[2/3] maven git commit: [MNG-6183] Dependency management debug message enhancements.
[MNG-6183] Dependency management debug message enhancements. o Updated to add debug log messages about optional flag management. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34afec69 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/34afec69 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/34afec69 Branch: refs/heads/MNG-6114 Commit: 34afec69c866f731f3f9d9b3606bbc31b51d64e7 Parents: ab800b0 Author: Christian SchulteAuthored: Wed Jan 27 03:46:11 2016 +0100 Committer: Christian Schulte Committed: Wed Mar 8 19:37:31 2017 +0100 -- .../maven/project/DefaultProjectDependenciesResolver.java| 8 1 file changed, 8 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/34afec69/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 16b60c2..21dfaa2 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 {