From 5354706f059b940884416be40a3db8a85de75824 Mon Sep 17 00:00:00 2001 From: Brett Leslie Porter Date: Mon, 1 Aug 2005 01:05:38 +0000 Subject: [PATCH] cleanup it0043 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226711 13f79535-47bb-0310-9956-ffa450edef68 --- maven-core-it/README.txt | 2 + maven-core-it/integration-tests.txt | 1 + maven-core-it/it0043/expected-results.txt | 2 +- maven-core-it/it0043/log.txt | 62 ----------------------- maven-core-it/it0043/pom.xml | 18 +++---- 5 files changed, 13 insertions(+), 72 deletions(-) delete mode 100644 maven-core-it/it0043/log.txt diff --git a/maven-core-it/README.txt b/maven-core-it/README.txt index 56e967cbc1..856cbab985 100644 --- a/maven-core-it/README.txt +++ b/maven-core-it/README.txt @@ -122,6 +122,8 @@ it0041: Test the use of a new type from a plugin it0042: Test that the reactor can establish the artifact location of known projects for dependencies +it0043: Test for repository inheritence - ensure using the same id overrides the defaults + ------------------------------------------------------------------------------- - generated sources diff --git a/maven-core-it/integration-tests.txt b/maven-core-it/integration-tests.txt index 54bb36645a..2064bf786e 100644 --- a/maven-core-it/integration-tests.txt +++ b/maven-core-it/integration-tests.txt @@ -1,3 +1,4 @@ +it0043 it0042 it0041 it0040 diff --git a/maven-core-it/it0043/expected-results.txt b/maven-core-it/it0043/expected-results.txt index 51b262cb0f..8442564bfa 100644 --- a/maven-core-it/it0043/expected-results.txt +++ b/maven-core-it/it0043/expected-results.txt @@ -1 +1 @@ -target/maven-it1011-1.0-SNAPSHOT.jar +target/maven-it0043-1.0-SNAPSHOT.jar diff --git a/maven-core-it/it0043/log.txt b/maven-core-it/it0043/log.txt deleted file mode 100644 index 8841ba9b3d..0000000000 --- a/maven-core-it/it0043/log.txt +++ /dev/null @@ -1,62 +0,0 @@ -+ Error stacktraces are turned on. -[INFO] Using local copy of plugins.xml (plugin mappings) for group: 'org.apache.maven.plugins' from: /home/forge/.m2/repository/org/apache/maven/plugins/plugins.xml -[INFO] maven-clean-plugin: resolved to version 2.0-beta-1-SNAPSHOT from local repository -[INFO] maven-clean-plugin: using locally installed snapshot -[INFO] maven-plugin-parent: using locally installed snapshot -[INFO] ---------------------------------------------------------------------------- -[INFO] Building org.apache.maven:maven-it1011:jar:1.0-SNAPSHOT -[INFO] task-segment: [clean:clean, package] -[INFO] ---------------------------------------------------------------------------- -[INFO] [clean:clean] -[INFO] Deleting directory /mnt/a/home/forge/work/opensource/m2/maven-core-it/it0043/target -[INFO] maven-resources-plugin: resolved to version 2.0-beta-1-SNAPSHOT from local repository -[INFO] maven-resources-plugin: using locally installed snapshot -[INFO] maven-compiler-plugin: resolved to version 2.0-beta-1-SNAPSHOT from local repository -[INFO] maven-compiler-plugin: using locally installed snapshot -[INFO] maven-surefire-plugin: resolved to version 2.0-beta-1-SNAPSHOT from local repository -[INFO] maven-surefire-plugin: using locally installed snapshot -[INFO] maven-jar-plugin: resolved to version 2.0-beta-1-SNAPSHOT from local repository -[INFO] maven-jar-plugin: using locally installed snapshot -[INFO] maven-source-plugin: resolved to version 2.0-beta-1-SNAPSHOT from local repository -[INFO] maven-source-plugin: using locally installed snapshot -[INFO] maven-projecthelp-plugin: resolved to version 2.0-beta-1-SNAPSHOT from local repository -[INFO] maven-projecthelp-plugin: using locally installed snapshot -[INFO] [resources:resources] -[INFO] [compiler:compile] -[INFO] No sources to compile -[INFO] maven-plugin-tools-api: using locally installed snapshot -[INFO] maven-plugin-tools: using locally installed snapshot -[INFO] maven: using locally installed snapshot -[INFO] [projecthelp:effective-pom {execution: default}] -[INFO] Writing effective-POM to: /mnt/a/home/forge/work/opensource/m2/maven-core-it/it0043/target/effective-pom.xml -[INFO] [resources:testResources] -[INFO] [compiler:testCompile] -Compiling 1 source file to /mnt/a/home/forge/work/opensource/m2/maven-core-it/it0043/target/test-classes -[INFO] surefire-booter: resolved to version 1.3-20050702.131742-1 from local repository -[INFO] surefire-root: resolved to version 1.1-20050702.131441-1 from local repository -[INFO] surefire: resolved to version 1.3-20050720.095413-5 from local repository -[INFO] [surefire:test] -[INFO] Setting reports dir: /mnt/a/home/forge/work/opensource/m2/maven-core-it/it0043/target/surefire-reports - -------------------------------------------------------- - T E S T S -------------------------------------------------------- -[surefire] Running RepositoryOverrideTest -[surefire] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.003 sec - -Results : -[surefire] Tests run: 1, Failures: 0, Errors: 0 - -[INFO] maven-archiver: using locally installed snapshot -[INFO] [jar:jar] -[WARNING] JAR will be empty - no content was marked for inclusion! -[INFO] Building jar: /mnt/a/home/forge/work/opensource/m2/maven-core-it/it0043/target/maven-it1011-1.0-SNAPSHOT.jar -[INFO] [source:jar] -[INFO] Not producing source bundle for a SNAPSHOT build -[INFO] ---------------------------------------------------------------------------- -[INFO] BUILD SUCCESSFUL -[INFO] ---------------------------------------------------------------------------- -[INFO] Total time: 2 seconds -[INFO] Finished at: Sun Jul 31 18:00:37 CEST 2005 -[INFO] Final Memory: 3M/10M -[INFO] ---------------------------------------------------------------------------- diff --git a/maven-core-it/it0043/pom.xml b/maven-core-it/it0043/pom.xml index d9afba4c9c..d5efad747e 100644 --- a/maven-core-it/it0043/pom.xml +++ b/maven-core-it/it0043/pom.xml @@ -1,7 +1,7 @@ 4.0.0 org.apache.maven - maven-it1011 + maven-it0043 1.0-SNAPSHOT @@ -21,13 +21,13 @@ - - - junit - junit - 3.8.1 - - + + + junit + junit + 3.8.1 + + @@ -40,7 +40,7 @@ effective-pom - target/effective-pom.xml + ${project.build.directory}/effective-pom.xml