From fdfdbb491d9cdefbcd5606ee73ca6024af902e6f Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Wed, 25 Oct 2006 14:14:09 +0000 Subject: [PATCH] more fixing of package, again i edited the copy ... git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@467661 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/resources/it0083/pom.xml | 5 ++- .../resources/it0083/test-component-a/pom.xml | 8 ++-- .../resources/it0083/test-component-b/pom.xml | 22 +++++----- .../resources/it0083/test-component-c/pom.xml | 36 +++++++-------- .../src/test/resources/it0084/pom.xml | 2 +- .../resources/it0084/test-component-a/pom.xml | 12 ++--- .../resources/it0084/test-component-b/pom.xml | 23 +++++----- .../resources/it0084/test-component-c/pom.xml | 44 +++++++++---------- 8 files changed, 74 insertions(+), 78 deletions(-) diff --git a/maven-core-integration-tests/src/test/resources/it0083/pom.xml b/maven-core-integration-tests/src/test/resources/it0083/pom.xml index eed08c5268..6a21b07e9a 100644 --- a/maven-core-integration-tests/src/test/resources/it0083/pom.xml +++ b/maven-core-integration-tests/src/test/resources/it0083/pom.xml @@ -1,9 +1,10 @@ 4.0.0 - Maven Integration Test :: it0083 + Maven Integration Test :: it0083 org.apache.maven.its.it0083 maven-it-it0083 - Verify that overriding a compile time dependency as provided in a WAR ensures it is not included. + Verify that overriding a compile time dependency as provided in a WAR ensures it is not included. + 0.1 pom diff --git a/maven-core-integration-tests/src/test/resources/it0083/test-component-a/pom.xml b/maven-core-integration-tests/src/test/resources/it0083/test-component-a/pom.xml index 78f5d63f97..6957e1fd5d 100644 --- a/maven-core-integration-tests/src/test/resources/it0083/test-component-a/pom.xml +++ b/maven-core-integration-tests/src/test/resources/it0083/test-component-a/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - - maven-it-it0083 - org.apache.maven.its.it0083 - 0.1 + + maven-it-it0083 + org.apache.maven.its.it0083 + 0.1 test-component-a 0.1 diff --git a/maven-core-integration-tests/src/test/resources/it0083/test-component-b/pom.xml b/maven-core-integration-tests/src/test/resources/it0083/test-component-b/pom.xml index b62bbedd22..03c42bb15e 100644 --- a/maven-core-integration-tests/src/test/resources/it0083/test-component-b/pom.xml +++ b/maven-core-integration-tests/src/test/resources/it0083/test-component-b/pom.xml @@ -1,20 +1,20 @@ 4.0.0 - - maven-it-it0083 - org.apache.maven.its.it0083 - 0.1 + + maven-it-it0083 + org.apache.maven.its.it0083 + 0.1 test-component-b 0.1 Test Component B jar - - - test - test-component-a - 0.1 - - + + + org.apache.maven.its.it0083 + test-component-a + 0.1 + + diff --git a/maven-core-integration-tests/src/test/resources/it0083/test-component-c/pom.xml b/maven-core-integration-tests/src/test/resources/it0083/test-component-c/pom.xml index eafdfb997b..c03f5a3186 100644 --- a/maven-core-integration-tests/src/test/resources/it0083/test-component-c/pom.xml +++ b/maven-core-integration-tests/src/test/resources/it0083/test-component-c/pom.xml @@ -1,27 +1,25 @@ 4.0.0 - - maven-it-it0083 - org.apache.maven.its.it0083 - 0.1 + + maven-it-it0083 + org.apache.maven.its.it0083 + 0.1 test-component-c 0.1 Test Component C war - - - - test - test-component-b - 0.1 - - - test - test-component-a - 0.1 - provided - - - + + + org.apache.maven.its.it0083 + test-component-b + 0.1 + + + org.apache.maven.its.it0083 + test-component-a + 0.1 + provided + + diff --git a/maven-core-integration-tests/src/test/resources/it0084/pom.xml b/maven-core-integration-tests/src/test/resources/it0084/pom.xml index a98c5f628f..1b9a5b3975 100644 --- a/maven-core-integration-tests/src/test/resources/it0084/pom.xml +++ b/maven-core-integration-tests/src/test/resources/it0084/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - Maven Integration Test :: it0084 + Maven Integration Test :: it0084 org.apache.maven.its.it0084 maven-it-it0084 Verify that the collector selecting a particular version gets the correct subtree diff --git a/maven-core-integration-tests/src/test/resources/it0084/test-component-a/pom.xml b/maven-core-integration-tests/src/test/resources/it0084/test-component-a/pom.xml index 06097d7d9e..220be64332 100644 --- a/maven-core-integration-tests/src/test/resources/it0084/test-component-a/pom.xml +++ b/maven-core-integration-tests/src/test/resources/it0084/test-component-a/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - - maven-it-it0084 - org.apache.maven.its.it0084 - 0.1 + + maven-it-it0084 + org.apache.maven.its.it0084 + 0.1 test-component-a 0.1 @@ -12,8 +12,8 @@ org.apache.maven - maven-core-it-support - 1.4 + maven-core-it-support + 1.4 diff --git a/maven-core-integration-tests/src/test/resources/it0084/test-component-b/pom.xml b/maven-core-integration-tests/src/test/resources/it0084/test-component-b/pom.xml index cee75b9d09..350ebc4aa8 100644 --- a/maven-core-integration-tests/src/test/resources/it0084/test-component-b/pom.xml +++ b/maven-core-integration-tests/src/test/resources/it0084/test-component-b/pom.xml @@ -1,20 +1,19 @@ 4.0.0 - - maven-it-it0084 - org.apache.maven.its.it0084 - 0.1 + + maven-it-it0084 + org.apache.maven.its.it0084 + 0.1 test-component-b 0.1 Test Component B jar - - - - org.apache.maven - maven-core-it-support - 1.3 - - + + + org.apache.maven + maven-core-it-support + 1.3 + + diff --git a/maven-core-integration-tests/src/test/resources/it0084/test-component-c/pom.xml b/maven-core-integration-tests/src/test/resources/it0084/test-component-c/pom.xml index a9b928c93e..54d13a582d 100644 --- a/maven-core-integration-tests/src/test/resources/it0084/test-component-c/pom.xml +++ b/maven-core-integration-tests/src/test/resources/it0084/test-component-c/pom.xml @@ -1,31 +1,29 @@ 4.0.0 - - maven-it-it0084 - org.apache.maven.its.it0084 - 0.1 + + maven-it-it0084 + org.apache.maven.its.it0084 + 0.1 test-component-c 0.1 Test Component C war - - - - org.apache.maven - maven-core-it-support - 1.4 - - - test - test-component-a - 0.1 - - - test - test-component-b - 0.1 - - - + + + org.apache.maven + maven-core-it-support + 1.4 + + + org.apache.maven.its.it0084 + test-component-a + 0.1 + + + org.apache.maven.its.it0084 + test-component-b + 0.1 + +