svn commit: r1176402 - in /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model: building/DefaultModelBuilder.java validation/DefaultModelValidator.java

[bentmann]

Author: bentmann
Date: Tue Sep 27 14:37:20 2011
New Revision: 1176402

URL: http://svn.apache.org/viewvc?rev=1176402&view=rev
Log:
[MNG-5157] NPE stemming from DefaultModelBuilder.containsCoordinates

o Revised original fix to prevent duplicate emission of error msg

Modified:
    
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
    
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java

Modified: 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=1176402&r1=1176401&r2=1176402&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
 (original)
+++ 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
 Tue Sep 27 14:37:20 2011
@@ -909,6 +909,18 @@ public class DefaultModelBuilder
             String artifactId = dependency.getArtifactId();
             String version = dependency.getVersion();
 
+            if ( groupId == null || groupId.length() <= 0 )
+            {
+                problems.add( Severity.ERROR, 
"'dependencyManagement.dependencies.dependency.groupId' for "
+                    + dependency.getManagementKey() + " is missing.", 
dependency.getLocation( "" ), null );
+                continue;
+            }
+            if ( artifactId == null || artifactId.length() <= 0 )
+            {
+                problems.add( Severity.ERROR, 
"'dependencyManagement.dependencies.dependency.artifactId' for "
+                    + dependency.getManagementKey() + " is missing.", 
dependency.getLocation( "" ), null );
+                continue;
+            }
             if ( version == null || version.length() <= 0 )
             {
                 problems.add( Severity.ERROR, 
"'dependencyManagement.dependencies.dependency.version' for "

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=1176402&r1=1176401&r2=1176402&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
 Tue Sep 27 14:37:20 2011
@@ -356,12 +356,6 @@ public class DefaultModelValidator
         {
             String key = dependency.getManagementKey();
 
-            validateStringNotEmpty( prefix + ".groupId", problems, 
Severity.ERROR, dependency.getGroupId(), key,
-                                    dependency );
-
-            validateStringNotEmpty( prefix + ".artifactId", problems, 
Severity.ERROR, dependency.getArtifactId(), key,
-                                    dependency );
-
             if ( "import".equals( dependency.getScope() ) )
             {
                 if ( !"pom".equals( dependency.getType() ) )