From 75b9558a537b48eeecabc579bc87bebd9c783781 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Fri, 6 Mar 2009 00:21:53 +0000 Subject: [PATCH] o Moved repository declarations to settings git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@750700 13f79535-47bb-0310-9956-ffa450edef68 --- .../it/MavenITmng3012CoreClassImportTest.java | 3 ++ .../src/test/resources/mng-3012/pom.xml | 13 ------ .../resources/mng-3012/settings-template.xml | 43 +++++++++++++++++++ 3 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 its/core-it-suite/src/test/resources/mng-3012/settings-template.xml diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java index 122064e498..d7e5cc0157 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java @@ -52,6 +52,9 @@ public class MavenITmng3012CoreClassImportTest verifier.deleteDirectory( "target" ); verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "0.1-mng3012", "jar" ); verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "0.1-mng3012", "pom" ); + 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-3012/pom.xml b/its/core-it-suite/src/test/resources/mng-3012/pom.xml index 4308c3810f..544a6377ef 100644 --- a/its/core-it-suite/src/test/resources/mng-3012/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3012/pom.xml @@ -32,19 +32,6 @@ under the License. these classes created by the core can be cast to classes loaded by the plugin. - - - maven-core-it - file:///${basedir}/repo - - ignore - - - ignore - - - - diff --git a/its/core-it-suite/src/test/resources/mng-3012/settings-template.xml b/its/core-it-suite/src/test/resources/mng-3012/settings-template.xml new file mode 100644 index 0000000000..c985d1a689 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3012/settings-template.xml @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + +