From 2510b8979cb31f8c17b201468e3b153169cb2541 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Thu, 5 Mar 2009 23:06:45 +0000 Subject: [PATCH] o Moved repository declarations to settings git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@750662 13f79535-47bb-0310-9956-ffa450edef68 --- ...avenITmng0818WarDepsNotTransitiveTest.java | 3 ++ .../src/test/resources/mng-0818/pom.xml | 13 ------ .../resources/mng-0818/settings-template.xml | 43 +++++++++++++++++++ 3 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 its/core-it-suite/src/test/resources/mng-0818/settings-template.xml diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java index dd9819fd32..00af7d7ee1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java @@ -52,6 +52,9 @@ public class MavenITmng0818WarDepsNotTransitiveTest verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); verifier.deleteArtifacts( "org.apache.maven.its.it0080" ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.getCliOptions().add( "--settings" ); + verifier.getCliOptions().add( "settings.xml" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/resources/mng-0818/pom.xml b/its/core-it-suite/src/test/resources/mng-0818/pom.xml index 66f2c84f7c..f77171ea68 100644 --- a/its/core-it-suite/src/test/resources/mng-0818/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-0818/pom.xml @@ -32,19 +32,6 @@ under the License. Test that depending on a WAR doesn't also get its dependencies transitively. - - - maven-core-it - file:///${basedir}/repo - - ignore - - - ignore - - - - org.apache.maven.its.it0080 diff --git a/its/core-it-suite/src/test/resources/mng-0818/settings-template.xml b/its/core-it-suite/src/test/resources/mng-0818/settings-template.xml new file mode 100644 index 0000000000..c985d1a689 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0818/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + +