MNG-3997: If one ModelProperty property URI starts with another ModelProperty URI and both are empty and both are consecutive in the pom, then the first tag was not being closed on unmarshalling to XML.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736541 13f79535-47bb-0310-9956-ffa450edef68

maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java

@@ -390,7 +390,8 @@ public class PomTransformer
             {
                 int index = props.indexOf(mp) + 1;
 
-                if(index <= props.size() && mp.isParentOf(props.get(index)) && !props.get(index).getUri().contains("#property"))
+                if(index <= props.size() && mp.isParentOf(props.get(index)) && mp.getDepth() != props.get(index).getDepth()
+                        && !props.get(index).getUri().contains("#property"))
                 {
                     p.add(new ModelProperty(mp.getUri(), null));
                 }

maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java

@@ -122,6 +122,15 @@ public class PomConstructionTest
        // System.out.println(pom.getDomainModel().asString());
         assertEquals( 1, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
     }
+
+    /** MNG-3997 */
+    public void testConsecutiveEmptyElements()
+        throws Exception
+    {
+        PomTestWrapper pom = buildPom( "consecutive_empty_elements" );
+        pom.getDomainModel().asString();
+    }
+
     //*/
     public void testOrderOfGoalsFromPluginExecutionWithoutPluginManagement()
         throws Exception

maven-project/src/test/resources-project-builder/consecutive_empty_elements/pom.xml

@@ -0,0 +1,14 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>test</groupId>
+    <artifactId>artifact</artifactId>
+    <version>1.0</version>
+
+    <developers>
+        <developer>
+            <organization/>
+            <organizationUrl/>
+        </developer>
+    </developers>
+
+</project>