You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/03/28 21:47:30 UTC
svn commit: r928485 - in /maven/maven-3/trunk:
maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Author: bentmann
Date: Sun Mar 28 19:47:30 2010
New Revision: 928485
URL: http://svn.apache.org/viewvc?rev=928485&view=rev
Log:
[MNG-4005] Throw Validation Error if pom contains a dependency with two different versions
o Relaxed to warning for now to ease migration
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=928485&r1=928484&r2=928485&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java (original)
+++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java Sun Mar 28 19:47:30 2010
@@ -173,7 +173,7 @@ public class PomConstructionTest
}
- /** MNG-4005 */
+ /** MNG-4005: postponed to 3.1
public void testValidationErrorUponNonUniqueDependencyKey()
throws Exception
{
@@ -229,6 +229,7 @@ public class PomConstructionTest
// expected
}
}
+ */
public void testDuplicateDependenciesCauseLastDeclarationToBePickedInLenientMode()
throws Exception
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java?rev=928485&r1=928484&r2=928485&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java Sun Mar 28 19:47:30 2010
@@ -299,6 +299,7 @@ public class DefaultModelValidator
ModelBuildingRequest request )
{
Severity errOn30 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 );
+ Severity errOn31 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 );
Map<String, Dependency> index = new HashMap<String, Dependency>();
@@ -340,7 +341,7 @@ public class DefaultModelValidator
+ StringUtils.defaultString( dependency.getVersion(), "(?)" );
}
- addViolation( problems, errOn30, prefix + ".(groupId:artifactId:type:classifier)", null,
+ addViolation( problems, errOn31, prefix + ".(groupId:artifactId:type:classifier)", null,
"must be unique: " + key + " -> " + msg );
}
else