You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/12/26 15:01:43 UTC

svn commit: r729496 - in /maven/components/trunk/maven-project/src/test: java/org/apache/maven/project/builder/ resources-project-builder/nexus/ resources-project-builder/plugin-exec-merging-version-insensitive/ resources-project-builder/plugin-exec-me...

Author: bentmann
Date: Fri Dec 26 06:01:42 2008
New Revision: 729496

URL: http://svn.apache.org/viewvc?rev=729496&view=rev
Log:
o Created UT from MNG-3924
o Created UT from MNG-3943
o Used trimmed down POMs for UT for MNG-3916

Added:
    maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/   (with props)
    maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml   (with props)
    maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/   (with props)
    maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml   (with props)
    maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/   (with props)
    maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml   (with props)
    maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/   (with props)
    maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml   (with props)
    maven/components/trunk/maven-project/src/test/resources-project-builder/xml-markup-interpolation/   (with props)
    maven/components/trunk/maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml   (with props)
Removed:
    maven/components/trunk/maven-project/src/test/resources-project-builder/nexus/
Modified:
    maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java

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=729496&r1=729495&r2=729496&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 Fri Dec 26 06:01:42 2008
@@ -49,18 +49,6 @@
     // them into a resolver, create the expression to extract the data to validate the Model, and the URI
     // to validate the properties. We also need a way to navigate from the Tex specification documents to
     // the test in question and vice versa. A little Eclipse plugin would do the trick.
-    public void testThatAllPluginExecutionsWithIdsAreJoined()
-        throws Exception
-    {        
-        File nexusLauncher = new File( testDirectory, "nexus/nexus-test-harness-launcher/pom.xml" );        
-        PomArtifactResolver resolver = artifactResolver( "nexus" );                
-        PomClassicDomainModel model = projectBuilder.buildModel( nexusLauncher, null, resolver );         
-        assertEquals( 3, model.getLineageCount() );        
-        PomTestWrapper pom = new PomTestWrapper( model );        
-        assertModelEquals( pom, "maven-dependency-plugin", "build/plugins[4]/artifactId" );        
-        List<?> executions = (List<?>) pom.getValue( "build/plugins[4]/executions" );                
-        assertEquals( 7, executions.size() );
-    }
 
     public void testThatExecutionsWithoutIdsAreMergedAndTheChildWins()
         throws Exception
@@ -83,7 +71,8 @@
         assertEquals( "maven-it-plugin-b", pom.getValue( "build/plugins[2]/artifactId" ) );
         assertEquals( 1, ( (List<?>) pom.getValue( "build/plugins[1]/dependencies" ) ).size() );
     }
-     /*
+
+    /* FIXME: cf. MNG-3821
     public void testErroneousJoiningOfDifferentPluginsWithEqualExecutionIds()
         throws Exception
     {
@@ -97,8 +86,8 @@
         assertEquals( "maven-it-plugin-b", pom.getValue( "reporting/plugins[2]/artifactId" ) );
         assertEquals( 1, ( (List<?>) pom.getValue( "reporting/plugins[1]/reportSets" ) ).size() );
     }
-     */
-    /* FIXME: cf. MNG-3886
+    //*/
+
     public void testOrderOfGoalsFromPluginExecutionWithoutPluginManagement()
         throws Exception
     {
@@ -111,6 +100,7 @@
         assertEquals( "e", pom.getValue( "build/plugins[1]/executions[1]/goals[5]" ) );
     }
 
+    /* FIXME: cf. MNG-3886
     public void testOrderOfGoalsFromPluginExecutionWithPluginManagement()
         throws Exception
     {
@@ -124,7 +114,6 @@
     }
     //*/
 
-    /* FIXME: cf. MNG-3887
     public void testOrderOfPluginExecutionsWithoutPluginManagement()
         throws Exception
     {
@@ -137,6 +126,7 @@
         assertEquals( "e", pom.getValue( "build/plugins[1]/executions[5]/id" ) );
     }
 
+    /* FIXME: cf. MNG-3887
     public void testOrderOfPluginExecutionsWithPluginManagement()
         throws Exception
     {
@@ -150,6 +140,29 @@
     }
     //*/
 
+    public void testMergeOfPluginExecutionsWhenChildInheritsPluginVersion()
+        throws Exception
+    {
+        PomTestWrapper pom = buildPom( "plugin-exec-merging-wo-version/sub" );
+        assertEquals( 4, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
+    }
+
+    /* FIXME: cf. MNG-3943
+    public void testMergeOfPluginExecutionsWhenChildAndParentUseDifferentPluginVersions()
+        throws Exception
+    {
+        PomTestWrapper pom = buildPom( "plugin-exec-merging-version-insensitive/sub" );
+        assertEquals( 4, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
+    }
+    //*/
+
+    public void testInterpolationWithXmlMarkup()
+        throws Exception
+    {
+        PomTestWrapper pom = buildPom( "xml-markup-interpolation" );
+        assertEquals( "<?xml version='1.0'?>Tom&Jerry", pom.getValue( "properties/xmlTest" ) );
+    }
+
     /* FIXME: cf. MNG-3925
     public void testOrderOfMergedPluginExecutionsWithoutPluginManagement()
         throws Exception
@@ -202,7 +215,6 @@
     }
     //*/
 
-    /* FIXME: cf. MNG-3938
     public void testOverridingOfInheritedPluginExecutionsWithoutPluginManagement()
         throws Exception
     {
@@ -212,6 +224,7 @@
         assertEquals( "child-non-default", pom.getValue( "build/plugins[1]/executions[@id='non-default']/phase" ) );
     }
 
+    /* FIXME: cf. MNG-3938
     public void testOverridingOfInheritedPluginExecutionsWithPluginManagement()
         throws Exception
     {

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml?rev=729496&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml Fri Dec 26 06:01:42 2008
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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>org.apache.maven.its.mng3916</groupId>
+  <artifactId>parent</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3943</name>
+  <description>
+    Test that plugin executions are properly merged during inheritance, even if the child uses a different
+    plugin version than the parent.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <!-- NOTE: Use different version than child -->
+        <version>1.0</version>
+        <executions>
+          <execution>
+            <id>parent-1</id>
+            <phase>parent-1</phase>
+          </execution>
+          <execution>
+            <id>parent-2</id>
+            <phase>parent-2</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml?rev=729496&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml Fri Dec 26 06:01:42 2008
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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>
+
+  <parent>
+    <groupId>org.apache.maven.its.mng3916</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child</artifactId>
+
+  <name>Maven Integration Test :: MNG-3943</name>
+  <description>
+    Test that plugin executions are properly merged during inheritance, even if the child uses a different
+    plugin version than the parent.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <!-- NOTE: Use different version than parent -->
+        <version>2.0</version>
+        <executions>
+          <execution>
+            <id>child-1</id>
+            <phase>child-1</phase>
+          </execution>
+          <execution>
+            <id>child-2</id>
+            <phase>child-2</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml?rev=729496&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml Fri Dec 26 06:01:42 2008
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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>org.apache.maven.its.mng3916</groupId>
+  <artifactId>parent</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3916</name> 
+  <description>
+    Test that plugin executions are properly merged during inheritance, even if the child plugin section has no
+    version.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <version>1.0</version>
+        <executions>
+          <execution>
+            <id>parent-1</id>
+            <phase>parent-1</phase>
+          </execution>
+          <execution>
+            <id>parent-2</id>
+            <phase>parent-2</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml?rev=729496&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml Fri Dec 26 06:01:42 2008
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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>
+
+  <parent>
+    <groupId>org.apache.maven.its.mng3916</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child</artifactId>
+
+  <name>Maven Integration Test :: MNG-3916</name> 
+  <description>
+    Test that plugin executions are properly merged during inheritance, even if the child plugin section has no
+    version.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <!-- NOTE: <version> element deliberately omitted here -->
+        <executions>
+          <execution>
+            <id>child-1</id>
+            <phase>child-1</phase>
+          </execution>
+          <execution>
+            <id>child-2</id>
+            <phase>child-2</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/xml-markup-interpolation/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/xml-markup-interpolation/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/xml-markup-interpolation/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/xml-markup-interpolation/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Added: maven/components/trunk/maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml?rev=729496&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml Fri Dec 26 06:01:42 2008
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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>org.apache.maven.its.mng3924</groupId>
+  <artifactId>test</artifactId>
+  <version>0.1-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: MNG-3924</name> 
+  <description>
+    Test that interpolation of properties that resolve to XML markup doesn't crash the project builder.
+  </description>
+
+  <properties>
+    <!-- That's the property containing escaped XML markup -->
+    <xmlMarkup>&lt;?xml version='1.0'?&gt;Tom&amp;Jerry</xmlMarkup>
+    <!-- That's a property where the above property will be resolved -->
+    <xmlTest>${xmlMarkup}</xmlTest>
+  </properties>
+</project>

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision