svn commit: r833465 - in /maven/maven-3/trunk/maven-model-builder/src: main/java/org/apache/maven/model/validation/ test/java/org/apache/maven/model/validation/ test/resources/poms/validation/

[bentmann]

Author: bentmann
Date: Fri Nov  6 16:45:50 2009
New Revision: 833465

URL: http://svn.apache.org/viewvc?rev=833465&view=rev
Log:
[MNG-4430] [regression] Presence of distribution management status in POM of local project does not cause validation error

Added:
    maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/distribution-management-status.xml   (with props)
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=833465&r1=833464&r2=833465&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 Fri Nov  6 16:45:50 2009
@@ -323,6 +323,11 @@
             DistributionManagement distMgmt = model.getDistributionManagement();
             if ( distMgmt != null )
             {
+                if ( distMgmt.getStatus() != null )
+                {
+                    addViolation( problems, false, "'distributionManagement.status' must not be specified" );
+                }
+
                 validateRepositoryLayout( problems, distMgmt.getRepository(), "distributionManagement.repository",
                                           request );
                 validateRepositoryLayout( problems, distMgmt.getSnapshotRepository(),

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=833465&r1=833464&r2=833465&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 Fri Nov  6 16:45:50 2009
@@ -380,4 +380,14 @@
         assertTrue( result.getErrors().get( 0 ).contains( "test:mip" ) );
     }
 
+    public void testDistributionManagementStatus()
+        throws Exception
+    {
+        SimpleProblemCollector result = validate( "distribution-management-status.xml" );
+
+        assertViolations( result, 1, 0 );
+
+        assertTrue( result.getErrors().get( 0 ).contains( "distributionManagement.status" ) );
+    }
+
 }

Added: maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/distribution-management-status.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/distribution-management-status.xml?rev=833465&view=auto
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/distribution-management-status.xml (added)
+++ maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/distribution-management-status.xml Fri Nov  6 16:45:50 2009
@@ -0,0 +1,29 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>foo</groupId>
+  <artifactId>bar</artifactId>
+  <version>0.1</version>
+
+  <distributionManagement>
+    <status>generated</status>
+  </distributionManagement>
+</project>

Propchange: maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/distribution-management-status.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/distribution-management-status.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision