Author: bentmann
Date: Tue Dec 9 15:00:12 2008
New Revision: 724924
URL: http://svn.apache.org/viewvc?rev=724924&view=rev
Log:
o Decoupled test from user environment
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/settings.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java?rev=724924&r1=724923&r2=724924&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
Tue Dec 9 15:00:12 2008
@@ -57,6 +57,8 @@
verifier.deleteDirectory( "test-2/child-1/target" );
verifier.deleteDirectory( "test-2/child-2/target" );
verifier.deleteDirectory( "test-3/sub-parent/child-a/target" );
+ verifier.getSystemProperties().setProperty(
"org.apache.maven.user-settings",
+ new File( testDir, "settings.xml" ).getAbsolutePath() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/settings.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/settings.xml?rev=724924&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/settings.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/settings.xml
Tue Dec 9 15:00:12 2008
@@ -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 to emulate a vanilla environment -->
+</settings>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3843/settings.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
