From 3d69cd05f8c1f872dc1fad47617ec1e138b43d02 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Thu, 5 Mar 2009 23:04:15 +0000 Subject: [PATCH] o Moved repository declarations to settings git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@750661 13f79535-47bb-0310-9956-ffa450edef68 --- .../it/MavenITmng0768OfflineModeTest.java | 3 ++ .../src/test/resources/mng-0768/pom.xml | 13 ------ .../resources/mng-0768/settings-template.xml | 43 +++++++++++++++++++ 3 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 its/core-it-suite/src/test/resources/mng-0768/settings-template.xml diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java index 7653d19d71..2fbc8dfa94 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java @@ -55,6 +55,9 @@ public class MavenITmng0768OfflineModeTest verifier.deleteDirectory( "target" ); verifier.deleteArtifacts( "org.apache.maven.its.it0069" ); verifier.setLogFileName( "log1.txt" ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.getCliOptions().add( "--settings" ); + verifier.getCliOptions().add( "settings.xml" ); verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" ); verifier.assertFilePresent( "target/compile.txt" ); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/resources/mng-0768/pom.xml b/its/core-it-suite/src/test/resources/mng-0768/pom.xml index 5585982f49..b5801bb8e4 100644 --- a/its/core-it-suite/src/test/resources/mng-0768/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-0768/pom.xml @@ -37,19 +37,6 @@ under the License. - - - maven-core-it - file:///${basedir}/repo - - ignore - - - false - - - - diff --git a/its/core-it-suite/src/test/resources/mng-0768/settings-template.xml b/its/core-it-suite/src/test/resources/mng-0768/settings-template.xml new file mode 100644 index 0000000000..c985d1a689 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0768/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + +