From c3f2a06650ca4a6d3941d5485825049fc15777d4 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Thu, 5 Mar 2009 22:45:59 +0000 Subject: [PATCH] o Moved repository declarations to settings git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@750647 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/it/MavenIT0087Test.java | 3 + .../src/test/resources/it0087/pom.xml | 25 --------- .../resources/it0087/settings-template.xml | 55 +++++++++++++++++++ 3 files changed, 58 insertions(+), 25 deletions(-) create mode 100644 its/core-it-suite/src/test/resources/it0087/settings-template.xml diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java index 91db8eaac0..c48c485bed 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java @@ -52,6 +52,9 @@ public class MavenIT0087Test verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); verifier.deleteArtifacts( "org.apache.maven.its.it0087" ); + 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/it0087/pom.xml b/its/core-it-suite/src/test/resources/it0087/pom.xml index ae3981f855..2525e9fbab 100644 --- a/its/core-it-suite/src/test/resources/it0087/pom.xml +++ b/its/core-it-suite/src/test/resources/it0087/pom.xml @@ -32,31 +32,6 @@ under the License. and the context classloader available to the plugin. - - - maven-core-it - file:///${basedir}/repo - - ignore - - - ignore - - - - - - maven-core-it - file:///${basedir}/repo - - ignore - - - ignore - - - - diff --git a/its/core-it-suite/src/test/resources/it0087/settings-template.xml b/its/core-it-suite/src/test/resources/it0087/settings-template.xml new file mode 100644 index 0000000000..cde4215860 --- /dev/null +++ b/its/core-it-suite/src/test/resources/it0087/settings-template.xml @@ -0,0 +1,55 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + +