Author: bentmann
Date: Wed Feb 4 18:46:05 2009
New Revision: 740821
URL: http://svn.apache.org/viewvc?rev=740821&view=rev
Log:
o Fixed ITs
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0479/test/settings.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java?rev=740821&r1=740820&r2=740821&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
Wed Feb 4 18:46:05 2009
@@ -23,7 +23,6 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.Collections;
import java.util.Properties;
/**
@@ -60,7 +59,9 @@
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();
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java?rev=740821&r1=740820&r2=740821&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
Wed Feb 4 18:46:05 2009
@@ -47,6 +47,9 @@
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();
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0479/test/settings.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0479/test/settings.xml?rev=740821&r1=740820&r2=740821&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0479/test/settings.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0479/test/settings.xml
Wed Feb 4 18:46:05 2009
@@ -33,14 +33,14 @@
<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>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/pom.xml?rev=740821&r1=740820&r2=740821&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/pom.xml
Wed Feb 4 18:46:05 2009
@@ -33,7 +33,7 @@
<repositories>
<repository>
- <id>central</id>
+ <id>maven-core-it</id>
<url>file:///${basedir}/repo</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings.xml?rev=740821&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings.xml
Wed Feb 4 18:46:05 2009
@@ -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>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0505/settings.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
