From 3ea056c92868ee2269fe3e34fb55502d335e1fdc Mon Sep 17 00:00:00 2001 From: Brett Leslie Porter Date: Wed, 19 Oct 2005 03:55:43 +0000 Subject: [PATCH] PR: MNG-1233 integration test for scope handling git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326365 13f79535-47bb-0310-9956-ffa450edef68 --- maven-core-it-support/1.3/pom.xml | 38 +++++++++++++++++++ .../java/org/apache/maven/it/Support.java | 5 +++ maven-core-it-support/1.4/pom.xml | 38 +++++++++++++++++++ .../java/org/apache/maven/it/Support.java | 5 +++ maven-core-it/README.txt | 4 ++ maven-core-it/integration-tests.txt | 2 + maven-core-it/it0034/expected-results.txt | 2 +- maven-core-it/it0034/prebuild-hook.txt | 2 +- maven-core-it/it0083/expected-results.txt | 6 +++ maven-core-it/it0083/goals.txt | 1 + maven-core-it/it0083/pom.xml | 14 +++++++ maven-core-it/it0083/test-component-a/pom.xml | 14 +++++++ .../test-component-a/src/main/java/A.java | 3 ++ maven-core-it/it0083/test-component-b/pom.xml | 22 +++++++++++ .../test-component-b/src/main/java/B.java | 5 +++ maven-core-it/it0083/test-component-c/pom.xml | 29 ++++++++++++++ .../test-component-c/src/main/java/C.java | 5 +++ .../src/main/webapp/WEB-INF/web.xml | 5 +++ maven-plugins/maven-source-plugin/pom.xml | 5 +-- 19 files changed, 200 insertions(+), 5 deletions(-) create mode 100644 maven-core-it-support/1.3/pom.xml create mode 100644 maven-core-it-support/1.3/src/main/java/org/apache/maven/it/Support.java create mode 100644 maven-core-it-support/1.4/pom.xml create mode 100644 maven-core-it-support/1.4/src/main/java/org/apache/maven/it/Support.java create mode 100644 maven-core-it/it0083/expected-results.txt create mode 100644 maven-core-it/it0083/goals.txt create mode 100644 maven-core-it/it0083/pom.xml create mode 100644 maven-core-it/it0083/test-component-a/pom.xml create mode 100644 maven-core-it/it0083/test-component-a/src/main/java/A.java create mode 100644 maven-core-it/it0083/test-component-b/pom.xml create mode 100644 maven-core-it/it0083/test-component-b/src/main/java/B.java create mode 100644 maven-core-it/it0083/test-component-c/pom.xml create mode 100644 maven-core-it/it0083/test-component-c/src/main/java/C.java create mode 100644 maven-core-it/it0083/test-component-c/src/main/webapp/WEB-INF/web.xml diff --git a/maven-core-it-support/1.3/pom.xml b/maven-core-it-support/1.3/pom.xml new file mode 100644 index 0000000000..adf35ee00c --- /dev/null +++ b/maven-core-it-support/1.3/pom.xml @@ -0,0 +1,38 @@ + + 4.0.0 + org.apache.maven + maven-core-it-support + jar + 1.3 + + + repo1 + Maven Central Repository + scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2 + + + + + + org.apache.maven.plugins + maven-core-it-plugin + 1.0-SNAPSHOT + true + + + + + + snapshots + http://snapshots.maven.codehaus.org/maven2/ + + + + + commons-lang + commons-lang + 1.0 + + + diff --git a/maven-core-it-support/1.3/src/main/java/org/apache/maven/it/Support.java b/maven-core-it-support/1.3/src/main/java/org/apache/maven/it/Support.java new file mode 100644 index 0000000000..84b1906c73 --- /dev/null +++ b/maven-core-it-support/1.3/src/main/java/org/apache/maven/it/Support.java @@ -0,0 +1,5 @@ +package org.apache.maven.it; + +public class Support +{ +} diff --git a/maven-core-it-support/1.4/pom.xml b/maven-core-it-support/1.4/pom.xml new file mode 100644 index 0000000000..c83f3fbc55 --- /dev/null +++ b/maven-core-it-support/1.4/pom.xml @@ -0,0 +1,38 @@ + + 4.0.0 + org.apache.maven + maven-core-it-support + jar + 1.4 + + + repo1 + Maven Central Repository + scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2 + + + + + + org.apache.maven.plugins + maven-core-it-plugin + 1.0-SNAPSHOT + true + + + + + + snapshots + http://snapshots.maven.codehaus.org/maven2/ + + + + + commons-io + commons-io + 1.0 + + + diff --git a/maven-core-it-support/1.4/src/main/java/org/apache/maven/it/Support.java b/maven-core-it-support/1.4/src/main/java/org/apache/maven/it/Support.java new file mode 100644 index 0000000000..84b1906c73 --- /dev/null +++ b/maven-core-it-support/1.4/src/main/java/org/apache/maven/it/Support.java @@ -0,0 +1,5 @@ +package org.apache.maven.it; + +public class Support +{ +} diff --git a/maven-core-it/README.txt b/maven-core-it/README.txt index 6225fcec1f..ac74109dc0 100644 --- a/maven-core-it/README.txt +++ b/maven-core-it/README.txt @@ -225,6 +225,10 @@ it0081: Test per-plugin dependencies. it0082: Test that the reactor can establish the artifact location of known projects for dependencies using process-sources to see that it works even when they aren't compiled +it0083: Verify that overriding a compile time dependency as provided in a WAR ensures it is not included. + +it0084: Verify that the collector selecting a particular version gets the correct subtree + ------------------------------------------------------------------------------- - generated sources diff --git a/maven-core-it/integration-tests.txt b/maven-core-it/integration-tests.txt index ccd717c43b..55c62d7512 100644 --- a/maven-core-it/integration-tests.txt +++ b/maven-core-it/integration-tests.txt @@ -1,3 +1,5 @@ +it0084 +it0083 it0082 it0081 it0080 diff --git a/maven-core-it/it0034/expected-results.txt b/maven-core-it/it0034/expected-results.txt index 2d5b8e074e..6885abb422 100644 --- a/maven-core-it/it0034/expected-results.txt +++ b/maven-core-it/it0034/expected-results.txt @@ -1,2 +1,2 @@ ${artifact:junit:junit:3.8:jar} -${artifact:org.apache.maven:maven-core-it-support:1.2:jar} +${artifact:org.apache.maven:maven-core-it-support:1.4:jar} diff --git a/maven-core-it/it0034/prebuild-hook.txt b/maven-core-it/it0034/prebuild-hook.txt index 1cc6ea6229..ac535074e4 100644 --- a/maven-core-it/it0034/prebuild-hook.txt +++ b/maven-core-it/it0034/prebuild-hook.txt @@ -1,2 +1,2 @@ -rm ${artifact:org.apache.maven:maven-core-it-support:1.2:jar} +rm ${artifact:org.apache.maven:maven-core-it-support:1.4:jar} rm ${artifact:junit:junit:3.8:jar} diff --git a/maven-core-it/it0083/expected-results.txt b/maven-core-it/it0083/expected-results.txt new file mode 100644 index 0000000000..ab0a278f53 --- /dev/null +++ b/maven-core-it/it0083/expected-results.txt @@ -0,0 +1,6 @@ +test-component-a/target/test-component-a-0.1.jar +test-component-b/target/test-component-b-0.1.jar +test-component-c/target/test-component-c-0.1.war +test-component-c/target/test-component-c-0.1.war!/WEB-INF/lib/test-component-b-0.1.jar +!test-component-c/target/test-component-c-0.1/WEB-INF/lib/test-component-a-0.1.jar +test-component-c/target/test-component-c-0.1/WEB-INF/lib/test-component-b-0.1.jar diff --git a/maven-core-it/it0083/goals.txt b/maven-core-it/it0083/goals.txt new file mode 100644 index 0000000000..ba3bd78738 --- /dev/null +++ b/maven-core-it/it0083/goals.txt @@ -0,0 +1 @@ +package diff --git a/maven-core-it/it0083/pom.xml b/maven-core-it/it0083/pom.xml new file mode 100644 index 0000000000..cb0f012490 --- /dev/null +++ b/maven-core-it/it0083/pom.xml @@ -0,0 +1,14 @@ + + 4.0.0 + test + test-components + 0.1 + Test Components + pom + + + test-component-c + test-component-b + test-component-a + + diff --git a/maven-core-it/it0083/test-component-a/pom.xml b/maven-core-it/it0083/test-component-a/pom.xml new file mode 100644 index 0000000000..2e6df5cfcb --- /dev/null +++ b/maven-core-it/it0083/test-component-a/pom.xml @@ -0,0 +1,14 @@ + + 4.0.0 + + test-components + test + 0.1 + + + test + test-component-a + 0.1 + Test Component A + jar + diff --git a/maven-core-it/it0083/test-component-a/src/main/java/A.java b/maven-core-it/it0083/test-component-a/src/main/java/A.java new file mode 100644 index 0000000000..73e270dbea --- /dev/null +++ b/maven-core-it/it0083/test-component-a/src/main/java/A.java @@ -0,0 +1,3 @@ +public class A { +} + diff --git a/maven-core-it/it0083/test-component-b/pom.xml b/maven-core-it/it0083/test-component-b/pom.xml new file mode 100644 index 0000000000..64745ad784 --- /dev/null +++ b/maven-core-it/it0083/test-component-b/pom.xml @@ -0,0 +1,22 @@ + + 4.0.0 + + test-components + test + 0.1 + + + test + test-component-b + 0.1 + Test Component B + jar + + + + test + test-component-a + 0.1 + + + diff --git a/maven-core-it/it0083/test-component-b/src/main/java/B.java b/maven-core-it/it0083/test-component-b/src/main/java/B.java new file mode 100644 index 0000000000..c288d4d8b7 --- /dev/null +++ b/maven-core-it/it0083/test-component-b/src/main/java/B.java @@ -0,0 +1,5 @@ +public class B + extends A +{ +} + diff --git a/maven-core-it/it0083/test-component-c/pom.xml b/maven-core-it/it0083/test-component-c/pom.xml new file mode 100644 index 0000000000..389cd90954 --- /dev/null +++ b/maven-core-it/it0083/test-component-c/pom.xml @@ -0,0 +1,29 @@ + + 4.0.0 + + test-components + test + 0.1 + + + test + test-component-c + 0.1 + Test Component C + war + + + + test + test-component-b + 0.1 + + + test + test-component-a + 0.1 + provided + + + + diff --git a/maven-core-it/it0083/test-component-c/src/main/java/C.java b/maven-core-it/it0083/test-component-c/src/main/java/C.java new file mode 100644 index 0000000000..f7546a58a7 --- /dev/null +++ b/maven-core-it/it0083/test-component-c/src/main/java/C.java @@ -0,0 +1,5 @@ +public class C + extends A +{ +} + diff --git a/maven-core-it/it0083/test-component-c/src/main/webapp/WEB-INF/web.xml b/maven-core-it/it0083/test-component-c/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..92bb2e9825 --- /dev/null +++ b/maven-core-it/it0083/test-component-c/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/maven-plugins/maven-source-plugin/pom.xml b/maven-plugins/maven-source-plugin/pom.xml index 1c3c34641e..cb30801bb4 100644 --- a/maven-plugins/maven-source-plugin/pom.xml +++ b/maven-plugins/maven-source-plugin/pom.xml @@ -8,7 +8,7 @@ maven-source-plugin maven-plugin Maven Source Plug-In - 2.1-SNAPSHOT + 2.0.1-SNAPSHOT org.apache.maven @@ -22,7 +22,6 @@ org.codehaus.plexus plexus-container-default - test - \ No newline at end of file +