You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/01/22 04:18:20 UTC
svn commit: r736541 - in /maven/components/trunk:
maven-project-builder/src/main/java/org/apache/maven/project/builder/
maven-project/src/test/java/org/apache/maven/project/builder/
maven-project/src/test/resources-project-builder/consecutive_empty_ele...
Author: sisbell
Date: Wed Jan 21 19:18:20 2009
New Revision: 736541
URL: http://svn.apache.org/viewvc?rev=736541&view=rev
Log:
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.
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/consecutive_empty_elements/
maven/components/trunk/maven-project/src/test/resources-project-builder/consecutive_empty_elements/pom.xml
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
Modified: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java?rev=736541&r1=736540&r2=736541&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java Wed Jan 21 19:18:20 2009
@@ -390,7 +390,8 @@
{
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));
}
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=736541&r1=736540&r2=736541&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java Wed Jan 21 19:18:20 2009
@@ -122,6 +122,15 @@
// 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
Added: maven/components/trunk/maven-project/src/test/resources-project-builder/consecutive_empty_elements/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/consecutive_empty_elements/pom.xml?rev=736541&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/consecutive_empty_elements/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/consecutive_empty_elements/pom.xml Wed Jan 21 19:18:20 2009
@@ -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>