svn commit: r821758 - in /maven/maven-3/trunk/maven-model-builder/src: main/java/org/apache/maven/model/validation/DefaultModelValidator.java test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java

[bentmann]

Author: bentmann
Date: Mon Oct  5 11:16:35 2009
New Revision: 821758

URL: http://svn.apache.org/viewvc?rev=821758&view=rev
Log:
[MNG-3991] POM validator allows <scope>optional</scope> but it is not valid.

o Relaxed validation to only output warnings instead of errors for unknown 
scopes

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

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=821758&r1=821757&r2=821758&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
 Mon Oct  5 11:16:35 2009
@@ -181,7 +181,11 @@
                 validateBoolean( "dependencies.dependency.optional", problems, 
warnOnBadBoolean, d.getOptional(),
                                  d.getManagementKey() );
 
-                validateEnum( "dependencies.dependency.scope", problems, 
warnOnBadDependencyScope, d.getScope(),
+                /*
+                 * TODO: Extensions like Flex Mojos use custom scopes like 
"merged", "internal", "external", etc. In
+                 * order to don't break backward-compat with those, only warn 
but don't error our.
+                 */
+                validateEnum( "dependencies.dependency.scope", problems, true, 
d.getScope(),
                               d.getManagementKey(), "provided", "compile", 
"runtime", "test", "system" );
             }
         }

Modified: 
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java?rev=821758&r1=821757&r2=821758&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
 (original)
+++ 
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
 Mon Oct  5 11:16:35 2009
@@ -327,11 +327,11 @@
     {
         SimpleProblemCollector result = validate( "bad-dependency-scope.xml" );
 
-        assertViolations( result, 2, 0 );
+        assertViolations( result, 0, 2 );
 
-        assertTrue( result.getErrors().get( 0 ).contains( "test:f" ) );
+        assertTrue( result.getWarnings().get( 0 ).contains( "test:f" ) );
 
-        assertTrue( result.getErrors().get( 1 ).contains( "test:g" ) );
+        assertTrue( result.getWarnings().get( 1 ).contains( "test:g" ) );
     }
 
 }