svn commit: r744687 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java

[bentmann]

Author: bentmann
Date: Sun Feb 15 16:20:42 2009
New Revision: 744687

URL: http://svn.apache.org/viewvc?rev=744687&view=rev
Log:
[MNG-3914] Add CLI option to control location of global settings from command 
line

o Updated IT to check support for CLI option in 2.1.0-M2+

Modified:
    
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java?rev=744687&r1=744686&r2=744687&view=diff
==============================================================================
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
 Sun Feb 15 16:20:42 2009
@@ -53,7 +53,7 @@
         verifier.deleteDirectory( "target" );
         verifier.getCliOptions().add( "--settings" );
         verifier.getCliOptions().add( "user-settings.xml" );
-        if ( matchesVersionRange( "[3.0-alpha-1,)" ) )
+        if ( matchesVersionRange( "[2.1.0-M2,)" ) )
         {
             verifier.getCliOptions().add( "--global-settings" );
             verifier.getCliOptions().add( "global-settings.xml" );