diff --git a/maven-core-it/README.txt b/maven-core-it/README.txt index 16ba27f2d4..fbf38c92df 100644 --- a/maven-core-it/README.txt +++ b/maven-core-it/README.txt @@ -90,6 +90,9 @@ it0028: Test that unused configuration parameters from the POM don't cause the it0029: Test for pluginManagement injection of plugin configuration. +it0030: Test for injection of dependencyManagement through parents of + dependency poms. + ------------------------------------------------------------------------------- - generated sources diff --git a/maven-core-it/integration-tests.txt b/maven-core-it/integration-tests.txt index ec8c139552..1c32648772 100644 --- a/maven-core-it/integration-tests.txt +++ b/maven-core-it/integration-tests.txt @@ -1,4 +1,5 @@ -it0029 +#it0030 +#it0029 it0028 it0027 it0026 diff --git a/maven-core-it/it0030/child-hierarchy/pom.xml b/maven-core-it/it0030/child-hierarchy/pom.xml new file mode 100644 index 0000000000..5e515c60a7 --- /dev/null +++ b/maven-core-it/it0030/child-hierarchy/pom.xml @@ -0,0 +1,26 @@ + + 4.0.0 + + org.apache.maven.it + maven-core-it0030 + 1.0-SNAPSHOT + + org.apache.maven.it + maven-core-it0030-child-hierarchy + pom + + 1.0-SNAPSHOT + + + + junit + junit + test + + + + + project1 + project2 + + diff --git a/maven-core-it/it0030/child-hierarchy/project1/pom.xml b/maven-core-it/it0030/child-hierarchy/project1/pom.xml new file mode 100644 index 0000000000..e7b4e9e3a8 --- /dev/null +++ b/maven-core-it/it0030/child-hierarchy/project1/pom.xml @@ -0,0 +1,13 @@ + + 4.0.0 + + org.apache.maven.it + maven-core-it0030-child-hierarchy + 1.0-SNAPSHOT + + org.apache.maven.it + maven-core-it0030-child-project1 + + 1.0-SNAPSHOT + + diff --git a/maven-core-it/it0030/child-hierarchy/project2/pom.xml b/maven-core-it/it0030/child-hierarchy/project2/pom.xml new file mode 100644 index 0000000000..19bfb4fe15 --- /dev/null +++ b/maven-core-it/it0030/child-hierarchy/project2/pom.xml @@ -0,0 +1,20 @@ + + 4.0.0 + + org.apache.maven.it + maven-core-it0030-child-hierarchy + 1.0-SNAPSHOT + + org.apache.maven.it + maven-core-it0030-child-project2 + + 1.0-SNAPSHOT + + + + org.apache.maven.it + maven-core-it0030-child-project1 + + + + diff --git a/maven-core-it/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-it/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/it0001/Person.java new file mode 100644 index 0000000000..8688a620db --- /dev/null +++ b/maven-core-it/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/it0001/Person.java @@ -0,0 +1,18 @@ +package org.apache.maven.it0001; + +public class Person +{ + private String name; + + public void setName( String newName ) + { + assert true; + + this.name = newName; + } + + public String getName() + { + return name; + } +} diff --git a/maven-core-it/it0030/expected-results.txt b/maven-core-it/it0030/expected-results.txt new file mode 100644 index 0000000000..a090c1e6f7 --- /dev/null +++ b/maven-core-it/it0030/expected-results.txt @@ -0,0 +1 @@ +child-hierarchy/project2/target/classes/org/apache/maven/it0001/Person.class diff --git a/maven-core-it/it0030/goals.txt b/maven-core-it/it0030/goals.txt new file mode 100644 index 0000000000..7c32f55981 --- /dev/null +++ b/maven-core-it/it0030/goals.txt @@ -0,0 +1 @@ +install diff --git a/maven-core-it/it0030/pom.xml b/maven-core-it/it0030/pom.xml new file mode 100644 index 0000000000..f8afb6d64e --- /dev/null +++ b/maven-core-it/it0030/pom.xml @@ -0,0 +1,28 @@ + + 4.0.0 + org.apache.maven.it + maven-core-it0030 + 1.0-SNAPSHOT + pom + Test for dependencyManagement injection for parent-poms of transitively resolved poms. + + + child-hierarchy + + + + + + junit + junit + 3.8.1 + + + org.apache.maven.it + maven-core-it0030-child-project1 + 1.0-SNAPSHOT + + + + + diff --git a/maven-core-it/it0030/prebuild-hook.txt b/maven-core-it/it0030/prebuild-hook.txt new file mode 100644 index 0000000000..918afb6165 --- /dev/null +++ b/maven-core-it/it0030/prebuild-hook.txt @@ -0,0 +1,4 @@ +rm ${artifact:org.apache.maven.it:maven-core-it0030:1.0-SNAPSHOT:jar} +rm ${artifact:org.apache.maven.it:maven-core-it0030-child-hierarchy:1.0-SNAPSHOT:jar} +rm ${artifact:org.apache.maven.it:maven-core-it0030-child-project1:1.0-SNAPSHOT:jar} +rm ${artifact:org.apache.maven.it:maven-core-it0030-child-project2:1.0-SNAPSHOT:jar}