You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by pg...@apache.org on 2009/04/13 18:47:50 UTC
svn commit: r764525 -
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
Author: pgier
Date: Mon Apr 13 16:47:50 2009
New Revision: 764525
URL: http://svn.apache.org/viewvc?rev=764525&view=rev
Log:
[MNG-3834] Improve missing version error message.
Modified:
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java?rev=764525&r1=764524&r2=764525&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java Mon Apr 13 16:47:50 2009
@@ -86,9 +86,9 @@
validateId( "dependencies.dependency.groupId", result, d.getGroupId() );
- validateStringNotEmpty( "dependencies.dependency.type", result, d.getType(), dependencySourceHint( d ) );
+ validateStringNotEmpty( "dependencies.dependency.type", result, d.getType(), d.getManagementKey() );
- validateStringNotEmpty( "dependencies.dependency.version", result, d.getVersion(), dependencySourceHint( d ) );
+ validateStringNotEmpty( "dependencies.dependency.version", result, d.getVersion(), d.getManagementKey() );
if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) )
{
@@ -263,19 +263,6 @@
// Field validation
// ----------------------------------------------------------------------
- /**
- * Create a hint string consisting of the groupId and artifactId for user validation
- * messages. For example when the version or type information is missing from a
- * dependency.
- *
- * @param d The dependency from which to make the hint.
- * @return String of the form g:a.
- */
- private String dependencySourceHint( Dependency d )
- {
- return d.getGroupId() + ":" + d.getArtifactId();
- }
-
private boolean validateStringNotEmpty( String fieldName, ModelValidationResult result, String string )
{
return validateStringNotEmpty( fieldName, result, string, null );