diff --git a/maven-core-it/README.txt b/maven-core-it/README.txt index ac74109dc0..845fa2cd5c 100644 --- a/maven-core-it/README.txt +++ b/maven-core-it/README.txt @@ -229,6 +229,11 @@ it0083: Verify that overriding a compile time dependency as provided in a WAR en it0084: Verify that the collector selecting a particular version gets the correct subtree +it0085: Verify that system-scoped dependencies get resolved with system scope + when they are resolved transitively via another (non-system) + dependency. Inherited scope should not apply in the case of + system-scoped dependencies, no matter where they are. + ------------------------------------------------------------------------------- - generated sources diff --git a/maven-core-it/integration-tests.txt b/maven-core-it/integration-tests.txt index 55c62d7512..da33f5bda0 100644 --- a/maven-core-it/integration-tests.txt +++ b/maven-core-it/integration-tests.txt @@ -1,3 +1,4 @@ +it0085 it0084 it0083 it0082 diff --git a/maven-core-it/it0085/dep/pom.xml b/maven-core-it/it0085/dep/pom.xml new file mode 100644 index 0000000000..aa8b72fd79 --- /dev/null +++ b/maven-core-it/it0085/dep/pom.xml @@ -0,0 +1,16 @@ + + 4.0.0 + + org.apache.maven.it + it0085-parent + 1.0 + + it0085-dep + + + + org.apache.maven.it + pom-dep + + + diff --git a/maven-core-it/it0085/expected-results.txt b/maven-core-it/it0085/expected-results.txt new file mode 100644 index 0000000000..8b61e48dbf --- /dev/null +++ b/maven-core-it/it0085/expected-results.txt @@ -0,0 +1,3 @@ +!war/target/it0085-war-1.0/WEB-INF/lib/pom.xml +!war/target/it0085-war-1.0/WEB-INF/lib/it0085-dep-1.0.jar +war/target/it0085-war-1.0/WEB-INF/lib/junit-3.8.1.jar diff --git a/maven-core-it/it0085/goals.txt b/maven-core-it/it0085/goals.txt new file mode 100644 index 0000000000..ba3bd78738 --- /dev/null +++ b/maven-core-it/it0085/goals.txt @@ -0,0 +1 @@ +package diff --git a/maven-core-it/it0085/pom.xml b/maven-core-it/it0085/pom.xml new file mode 100644 index 0000000000..c1b3e50651 --- /dev/null +++ b/maven-core-it/it0085/pom.xml @@ -0,0 +1,24 @@ + + 4.0.0 + org.apache.maven.it + it0085-parent + 1.0 + pom + + + dep + war + + + + + + org.apache.maven.it + pom-dep + 1.4.2 + system + ${basedir}/pom.xml + + + + diff --git a/maven-core-it/it0085/war/pom.xml b/maven-core-it/it0085/war/pom.xml new file mode 100644 index 0000000000..885aed6f41 --- /dev/null +++ b/maven-core-it/it0085/war/pom.xml @@ -0,0 +1,24 @@ + + 4.0.0 + + org.apache.maven.it + it0085-parent + 1.0 + + it0085-war + war + + + + junit + junit + 3.8.1 + + + org.apache.maven.it + it0085-dep + 1.0 + provided + + + diff --git a/maven-core-it/it0085/war/src/main/webapp/WEB-INF/web.xml b/maven-core-it/it0085/war/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..692c8c3b9a --- /dev/null +++ b/maven-core-it/it0085/war/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,2 @@ + +