svn commit: r989074 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/MavenITBootstrapTest.java resources/bootstrap/settings.xml

[be...@apache.org]

Author: bentmann
Date: Wed Aug 25 12:41:29 2010
New Revision: 989074

URL: http://svn.apache.org/viewvc?rev=989074&view=rev
Log:
o Decoupled ITs from user environment

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml   (with props)
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java?rev=989074&r1=989073&r2=989074&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java Wed Aug 25 12:41:29 2010
@@ -47,6 +47,8 @@ public class MavenITBootstrapTest
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
         verifier.setAutoclean( false );
+        verifier.getCliOptions().add( "--settings" );
+        verifier.getCliOptions().add( "settings.xml" );
         verifier.executeGoal( "test-compile" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml?rev=989074&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml Wed Aug 25 12:41:29 2010
@@ -0,0 +1,24 @@
+<?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>
+  <!-- empty and just here to disable any custom settings from the user's environment -->
+</settings>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/settings.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision