From 6124ec2857476c7b2af71847750ec836c2953b4a Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Fri, 6 Mar 2009 00:42:40 +0000 Subject: [PATCH] o Moved repository declarations to settings git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@750715 13f79535-47bb-0310-9956-ffa450edef68 --- ...90TransitiveDependencyScopeUpdateTest.java | 3 ++ .../src/test/resources/mng-3890/pom.xml | 13 ------ .../resources/mng-3890/settings-template.xml | 43 +++++++++++++++++++ 3 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 its/core-it-suite/src/test/resources/mng-3890/settings-template.xml diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java index 8648e77a5f..d93c8ea7a9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java @@ -51,6 +51,9 @@ public class MavenITmng3890TransitiveDependencyScopeUpdateTest verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng3890" ); + 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-3890/pom.xml b/its/core-it-suite/src/test/resources/mng-3890/pom.xml index 3f99b47922..60d9d5eff3 100644 --- a/its/core-it-suite/src/test/resources/mng-3890/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3890/pom.xml @@ -51,19 +51,6 @@ under the License. [INFO] ======================================================================== --> - - - maven-core-it - file:///${basedir}/repo - - ignore - - - ignore - - - - org.apache.maven.its.mng3890 diff --git a/its/core-it-suite/src/test/resources/mng-3890/settings-template.xml b/its/core-it-suite/src/test/resources/mng-3890/settings-template.xml new file mode 100644 index 0000000000..c985d1a689 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3890/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + +