Repository: maven Updated Branches: refs/heads/master 121d987a4 -> 8e0b9838a
[MNG-5971] Imported dependencies should be available to inheritance processing o Updated a warning message trying to make it as least confusing as possible. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8e0b9838 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8e0b9838 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8e0b9838 Branch: refs/heads/master Commit: 8e0b9838a826d36ec18cfffce5e2273fff88cffa Parents: 121d987 Author: Christian Schulte <schu...@apache.org> Authored: Sat Dec 10 20:26:22 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Sat Dec 10 20:26:22 2016 +0100 ---------------------------------------------------------------------- .../model/composition/DefaultDependencyManagementImporter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/8e0b9838/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java index 967c81d..4839140 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java @@ -123,9 +123,9 @@ public class DefaultDependencyManagementImporter "Dependency '%1$s' has conflicting dependency management in model '%2$s'%3$s%4$s. " + "To resolve the conflicts, declare the dependency management for dependency '%1$s' " + "directly in the dependency management of model '%2$s' to override what gets " - + "imported, add exclusions for the conflicting dependencies or, if the Maven version " - + "in use supports the include scope feature, use that feature to rearrange the " - + "causing dependencies in the inheritance hierarchy to apply standard override logic " + + "imported. If the Maven version in use supports it, add exclusions for the " + + "conflicting dependencies or use the include scope feature to rearrange the " + + "causing dependencies in the inheritance hierarchy applying standard override logic " + "based on artifact coordinates. Without resolving the conflicts, your build relies " + "on indeterministic behaviour.", conflictingDependencies.get( 0 ).getManagementKey(), target.getId(),
