maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From schu...@apache.org
Subject maven git commit: [MNG-5971] Imported dependencies should be available to inheritance processing
Date Sat, 20 Aug 2016 05:14:56 GMT
Repository: maven
Updated Branches:
  refs/heads/master 1c633fa90 -> eaa4cdfb8


[MNG-5971] Imported dependencies should be available to inheritance processing

o Updated to mention model version 4.1.0 in the warning message instead of
  Maven 3.4.0.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/eaa4cdfb
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/eaa4cdfb
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/eaa4cdfb

Branch: refs/heads/master
Commit: eaa4cdfb8e2f32306b425ecad68fde25f21271fa
Parents: 1c633fa
Author: Christian Schulte <schulte@apache.org>
Authored: Sat Aug 20 07:13:56 2016 +0200
Committer: Christian Schulte <schulte@apache.org>
Committed: Sat Aug 20 07:13:56 2016 +0200

----------------------------------------------------------------------
 .../DefaultDependencyManagementImporter.java    | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/eaa4cdfb/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 dc06b9d..c3a0201 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
@@ -108,17 +108,17 @@ public class DefaultDependencyManagementImporter
                                            ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_5
),
                         ModelProblem.Version.V20 ).
                         setMessage( String.format(
-                                "Multiple conflicting imports of dependency '%1$s' into model
'%2$s'%3$s(%4$s). "
-                                    + "To resolve this conflict, either declare the dependency
directly "
-                                    + "in the dependency management of model '%2$s' to override
what gets imported "
-                                    + "or, as of Maven 3.4, rearrange the causing imports
in the inheritance hierarchy "
-                                    + "to apply standard override logic based on artifact
coordinates. "
-                                    + "Without resolving this conflict, your build relies
on indeterministic "
-                                    + "behaviour.",
-                                conflictingDependencies.get( 0 ).getManagementKey(), target.getId(),
-                                target.getPomFile() != null
-                                    ? " @ '" + target.getPomFile().getAbsolutePath() + "'
"
-                                    : " ", conflictsBuilder.substring( 2 ) ) ) );
+                            "Multiple conflicting imports of dependency '%1$s' into model
'%2$s'%3$s(%4$s). "
+                                + "To resolve this conflict, either declare the dependency
directly "
+                                + "in the dependency management of model '%2$s' to override
what gets imported "
+                                + "or, as of model version 4.1.0, rearrange the causing imports
in the inheritance "
+                                + "hierarchy to apply standard override logic based on artifact
coordinates. "
+                                + "Without resolving this conflict, your build relies on
indeterministic "
+                                + "behaviour.",
+                            conflictingDependencies.get( 0 ).getManagementKey(), target.getId(),
+                            target.getPomFile() != null
+                                ? " @ '" + target.getPomFile().getAbsolutePath() + "' "
+                                : " ", conflictsBuilder.substring( 2 ) ) ) );
 
                 }
             }


Mime
View raw message