diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0100Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0100Test.java index cbed63679c..597481a385 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0100Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0100Test.java @@ -23,8 +23,7 @@ import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.Properties; public class MavenIT0100Test extends AbstractMavenIntegrationTestCase @@ -40,21 +39,12 @@ public class MavenIT0100Test File child = new File( testDir, "parent/child" ); Verifier verifier = new Verifier( child.getAbsolutePath() ); - - List options = new ArrayList(); - options.add( "-Doutput=\"" + new File( child, "target/effective-pom.txt" ).getAbsolutePath() + "\"" ); - - verifier.setCliOptions( options ); - - List goals = new ArrayList(); - goals.add( "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom" ); - goals.add( "verify" ); - - verifier.executeGoals( goals ); - + verifier.executeGoal( "initialize" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + + Properties props = verifier.loadProperties( "target/parent.properties" ); + assertEquals( "parent, child, parent, child", props.getProperty( "project.description" ) ); } -} +} diff --git a/its/core-it-suite/src/test/resources/it0100/parent/child/pom.xml b/its/core-it-suite/src/test/resources/it0100/parent/child/pom.xml index 0f2e515f48..2e6531cbd4 100644 --- a/its/core-it-suite/src/test/resources/it0100/parent/child/pom.xml +++ b/its/core-it-suite/src/test/resources/it0100/parent/child/pom.xml @@ -1,5 +1,26 @@ - + + + + + + 4.0.0 parent @@ -7,38 +28,30 @@ 1.0 - 4.0.0 child - child - pom + child + ${pom.parent.artifactId}, ${pom.artifactId}, ${parent.artifactId}, ${pom.artifactId} + - - - maven-verifier-plugin - - - verify - - verify + eval + + target/${project.parent.artifactId}.properties + + project/description + + diff --git a/its/core-it-suite/src/test/resources/it0100/parent/child/src/test/verifier/verifications.xml b/its/core-it-suite/src/test/resources/it0100/parent/child/src/test/verifier/verifications.xml deleted file mode 100644 index 43cb3f4e53..0000000000 --- a/its/core-it-suite/src/test/resources/it0100/parent/child/src/test/verifier/verifications.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - target/effective-pom.txt - Parent: parent, project: child - - - diff --git a/its/core-it-suite/src/test/resources/it0100/parent/pom.xml b/its/core-it-suite/src/test/resources/it0100/parent/pom.xml index c06f293a24..f9ef88d417 100644 --- a/its/core-it-suite/src/test/resources/it0100/parent/pom.xml +++ b/its/core-it-suite/src/test/resources/it0100/parent/pom.xml @@ -1,32 +1,32 @@ - + + + + + 4.0.0 + org.apache.maven.its.it0100 parent - pom 1.0 + pom + parent - - - - maven-antrun-plugin - - - validate - - - Parent: ${pom.parent.artifactId}, project: ${pom.artifactId} - Parent: ${parent.artifactId}, project: ${pom.artifactId} - - - - run - - - - - - - diff --git a/its/core-it-suite/src/test/resources/it0100/pom.xml b/its/core-it-suite/src/test/resources/it0100/pom.xml index c55ca22b8f..ab80ad8d15 100644 --- a/its/core-it-suite/src/test/resources/it0100/pom.xml +++ b/its/core-it-suite/src/test/resources/it0100/pom.xml @@ -1,12 +1,35 @@ - + + + + + 4.0.0 - Maven Integration Test :: it0100 + org.apache.maven.its.it0100 maven-it-it0100 - Test that ${parent.artifactId} resolves correctly. [MNG-2124] - pom 1.0 + pom + + Maven Integration Test :: it0100 + Test that ${parent.artifactId} resolves correctly. [MNG-2124] + parent/child