From 7a7c44a4090c67bdc6711a5dad31f7a9c146e21d Mon Sep 17 00:00:00 2001 From: Kenney Westerhof Date: Fri, 3 Mar 2006 17:48:26 +0000 Subject: [PATCH] Added a second structure, testing the other way around ../../something git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382902 13f79535-47bb-0310-9956-ffa450edef68 --- maven-core-it/it0097/expected-results.txt | 1 + maven-core-it/it0097/pom.xml | 1 + .../it0097/project/project-level2/pom.xml | 1 + .../project/project-sibling-level2/pom.xml | 35 +++++++++++++++++ .../main/java/com/stchome/mavenTest/App.java | 13 +++++++ .../java/com/stchome/mavenTest/AppTest.java | 38 +++++++++++++++++++ .../project/relative-project-level2/pom.xml | 16 ++++++++ .../relative-project-level3/pom.xml | 16 ++++++++ 8 files changed, 121 insertions(+) create mode 100644 maven-core-it/it0097/project/project-sibling-level2/pom.xml create mode 100644 maven-core-it/it0097/project/project-sibling-level2/src/main/java/com/stchome/mavenTest/App.java create mode 100644 maven-core-it/it0097/project/project-sibling-level2/src/test/java/com/stchome/mavenTest/AppTest.java create mode 100644 maven-core-it/it0097/project/relative-project-level2/pom.xml create mode 100644 maven-core-it/it0097/project/relative-project-level2/relative-project-level3/pom.xml diff --git a/maven-core-it/it0097/expected-results.txt b/maven-core-it/it0097/expected-results.txt index c57493b90d..48c56c2f1f 100644 --- a/maven-core-it/it0097/expected-results.txt +++ b/maven-core-it/it0097/expected-results.txt @@ -1 +1,2 @@ project/project-level2/project-level3/target/it0097.txt +project/project-sibling-level2/target/it0097.txt diff --git a/maven-core-it/it0097/pom.xml b/maven-core-it/it0097/pom.xml index d0acdbbdc8..3a841acd21 100644 --- a/maven-core-it/it0097/pom.xml +++ b/maven-core-it/it0097/pom.xml @@ -8,5 +8,6 @@ plugin project/project-level2/project-level3 + project/relative-project-level2/relative-project-level3/ diff --git a/maven-core-it/it0097/project/project-level2/pom.xml b/maven-core-it/it0097/project/project-level2/pom.xml index 5e5f4ef49d..d795bb7151 100644 --- a/maven-core-it/it0097/project/project-level2/pom.xml +++ b/maven-core-it/it0097/project/project-level2/pom.xml @@ -12,5 +12,6 @@ pom project-level3 + ../project-sibling-level2 diff --git a/maven-core-it/it0097/project/project-sibling-level2/pom.xml b/maven-core-it/it0097/project/project-sibling-level2/pom.xml new file mode 100644 index 0000000000..05f13ee5dd --- /dev/null +++ b/maven-core-it/it0097/project/project-sibling-level2/pom.xml @@ -0,0 +1,35 @@ + + + org.apache.maven.it0097 + maven-it0097-project-level2 + 1 + ../project-level2 + + 4.0.0 + maven-it0097-project-sibling-level2 + + + junit + junit + 3.8.1 + test + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + + diff --git a/maven-core-it/it0097/project/project-sibling-level2/src/main/java/com/stchome/mavenTest/App.java b/maven-core-it/it0097/project/project-sibling-level2/src/main/java/com/stchome/mavenTest/App.java new file mode 100644 index 0000000000..0e6d8e31a4 --- /dev/null +++ b/maven-core-it/it0097/project/project-sibling-level2/src/main/java/com/stchome/mavenTest/App.java @@ -0,0 +1,13 @@ +package com.stchome.mavenTest; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff --git a/maven-core-it/it0097/project/project-sibling-level2/src/test/java/com/stchome/mavenTest/AppTest.java b/maven-core-it/it0097/project/project-sibling-level2/src/test/java/com/stchome/mavenTest/AppTest.java new file mode 100644 index 0000000000..efb5aaa5b5 --- /dev/null +++ b/maven-core-it/it0097/project/project-sibling-level2/src/test/java/com/stchome/mavenTest/AppTest.java @@ -0,0 +1,38 @@ +package com.stchome.mavenTest; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff --git a/maven-core-it/it0097/project/relative-project-level2/pom.xml b/maven-core-it/it0097/project/relative-project-level2/pom.xml new file mode 100644 index 0000000000..6047ddf32d --- /dev/null +++ b/maven-core-it/it0097/project/relative-project-level2/pom.xml @@ -0,0 +1,16 @@ + + 4.0.0 + + org.apache.maven.it0097 + maven-it0097-project-level1 + 1 + + + maven-it0097-relative-project-level2 + + pom + + relative-project-level3 + + diff --git a/maven-core-it/it0097/project/relative-project-level2/relative-project-level3/pom.xml b/maven-core-it/it0097/project/relative-project-level2/relative-project-level3/pom.xml new file mode 100644 index 0000000000..d89e87df55 --- /dev/null +++ b/maven-core-it/it0097/project/relative-project-level2/relative-project-level3/pom.xml @@ -0,0 +1,16 @@ + + 4.0.0 + + org.apache.maven.it0097 + maven-it0097-relative-project-level2 + 1 + + + maven-it0097-relative-project-level3 + + pom + + ../../project-sibling-level2 + +