From 131395bbbf584a015ccefd17b4f078ee0a4ca7d4 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Thu, 5 Mar 2009 22:43:29 +0000 Subject: [PATCH] o Moved repository declarations to settings git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@750646 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/it/MavenIT0085Test.java | 3 ++ .../src/test/resources/it0085/pom.xml | 13 ------ .../resources/it0085/settings-template.xml | 43 +++++++++++++++++++ 3 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 its/core-it-suite/src/test/resources/it0085/settings-template.xml diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085Test.java index 2b9109ebcf..cae33c7fc5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085Test.java @@ -49,6 +49,9 @@ public class MavenIT0085Test verifier.deleteDirectory( "target" ); verifier.deleteArtifacts( "org.apache.maven.its.it0085" ); verifier.getSystemProperties().setProperty( "test.home", testDir.getAbsolutePath() ); + 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/it0085/pom.xml b/its/core-it-suite/src/test/resources/it0085/pom.xml index 453d17e4c7..88b547929f 100644 --- a/its/core-it-suite/src/test/resources/it0085/pom.xml +++ b/its/core-it-suite/src/test/resources/it0085/pom.xml @@ -14,19 +14,6 @@ system-scoped dependencies, no matter where they are. - - - maven-core-it - file:///${basedir}/repo - - ignore - - - ignore - - - - org.apache.maven.its.it0085 diff --git a/its/core-it-suite/src/test/resources/it0085/settings-template.xml b/its/core-it-suite/src/test/resources/it0085/settings-template.xml new file mode 100644 index 0000000000..c985d1a689 --- /dev/null +++ b/its/core-it-suite/src/test/resources/it0085/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + +