You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2016/09/24 15:13:51 UTC
[30/40] maven git commit: [MNG-5971] Imported dependencies should be
available to inheritance processing
[MNG-5971] Imported dependencies should be available to inheritance processing
o Downgraded the version of the model problem from 3.5 to 2.0. Issue got
introduced in Maven 2.0.9.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/df7e29b9
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/df7e29b9
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/df7e29b9
Branch: refs/heads/MNG-6012-Missing-Profile-At-End
Commit: df7e29b9d60091879fb6c485aa5fa7ac415737ae
Parents: 059b9ab
Author: Christian Schulte <sc...@apache.org>
Authored: Sun Aug 14 00:08:53 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Sun Aug 14 00:08:53 2016 +0200
----------------------------------------------------------------------
.../model/composition/DefaultDependencyManagementImporter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/df7e29b9/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 4072c24..dc06b9d 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
@@ -106,7 +106,7 @@ public class DefaultDependencyManagementImporter
problems.add( new ModelProblemCollectorRequest(
effectiveSeverity( request.getValidationLevel(),
ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_5 ),
- ModelProblem.Version.V35 ).
+ 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 "