diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index 2c7d4e6989..a749da96a5 100644 --- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -631,7 +631,6 @@ public class DefaultMavenProjectBuilder for(ModelContainer mc : profileContainers) { List transformed = new ArrayList(); - //transformed.add(new ModelProperty(ProjectUri.xUri, null)); for(ModelProperty mp : mc.getProperties()) { if(mp.getUri().startsWith(ProjectUri.Profiles.Profile.xUri) && !mp.getUri().equals(ProjectUri.Profiles.Profile.id) diff --git a/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java index 90002090fc..3559900361 100644 --- a/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -70,13 +70,13 @@ public class PomConstructionTest * * @throws Exception */ - /* + public void testEmptyUrl() throws Exception { buildPomFromMavenProject( "empty-distMng-repo-url", null ); } - */ + /** * Tests that modules is not overriden by profile @@ -117,7 +117,16 @@ public class PomConstructionTest PomTestWrapper pom = buildPom( "plugin-config-properties" ); assertEquals( "my.property", pom.getValue( "build/plugins[1]/configuration[1]/systemProperties[1]/property[1]/name" ) ); } - + + /*MNG-3900*/ + /* + public void testProfilePropertiesInterpolation() + throws Exception + { + PomTestWrapper pom = buildPomFromMavenProject( "profile-properties-interpolation", "a" ); + assertEquals("PASSED", pom.getValue("properties[1]/test")); + } + */ // Some better conventions for the test poms needs to be created and each of these tests // that represent a verification of a specification item needs to be a couple lines at most. @@ -133,8 +142,9 @@ public class PomConstructionTest { // This should be 2 //assertEquals( 2, model.getLineageCount() ); - //PomTestWrapper tester = buildPom("micromailer"); - //assertModelEquals( tester, "child-descriptor", "build/plugins[1]/executions[1]/goals[1]" ); + PomTestWrapper tester = buildPom("micromailer"); + // System.out.println(tester.getDomainModel().asString()); + // assertModelEquals( tester, "child-descriptor", "build/plugins[1]/executions[1]/goals[1]" ); } /*MNG-