o Fixed ITs

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@740821 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-02-04 18:46:05 +00:00
parent 5326889b2c
commit e1950c11b6
5 changed files with 43 additions and 5 deletions

View File

@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.Collections;
import java.util.Properties;
/**
@ -60,7 +59,9 @@ public class MavenITmng0479OverrideCentralRepoTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setCliOptions( Collections.singletonList( "-s settings.xml" ) );
verifier.filterFile( "settings.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-expression:2.1-SNAPSHOT:eval" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

View File

@ -47,6 +47,9 @@ public class MavenITmng0505VersionRangeTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0505" );
verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

View File

@ -33,14 +33,14 @@ under the License.
<repository>
<id>central</id>
<name>it0043</name>
<url>file:///${basedir}/target/maven-core-it0043-repo</url>
<url>@baseurl@/target/maven-core-it0043-repo</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<name>it0043</name>
<url>file:///${basedir}/target/maven-core-it0043-repo</url>
<url>@baseurl@/target/maven-core-it0043-repo</url>
</pluginRepository>
</pluginRepositories>
</profile>

View File

@ -33,7 +33,7 @@ under the License.
<repositories>
<repository>
<id>central</id>
<id>maven-core-it</id>
<url>file:///${basedir}/repo</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>

View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<settings>
<!--
Make sure the test queries only the test repo.
-->
<mirrors>
<mirror>
<id>mng-0505</id>
<name>mng-0505</name>
<url>@baseurl@/target/null</url>
<mirrorOf>central</mirrorOf>
</mirror>
</mirrors>
</settings>