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

[brett]

Author: brett
Date: Thu Jan 29 20:13:04 2009
New Revision: 738992

URL: http://svn.apache.org/viewvc?rev=738992&view=rev
Log:
always use --settings, only use the system property for global on those that 
don't support the argument

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=738992&r1=738991&r2=738992&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
 Thu Jan 29 20:13:04 2009
@@ -50,17 +50,19 @@
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        Properties systemProperties = new Properties();
-        systemProperties.put( "org.apache.maven.user-settings", 
"user-settings.xml" );
-        systemProperties.put( "org.apache.maven.global-settings", 
"global-settings.xml" );
-        verifier.setSystemProperties( systemProperties );
-        if ( matchesVersionRange( "(2.99,)" ) )
+        verifier.getCliOptions().add( "--settings" );
+        verifier.getCliOptions().add( new File( testDir, "user-settings.xml" 
).getAbsolutePath() );
+        if ( matchesVersionRange( "[3.0-alpha-1,)" ) )
         {
-            verifier.getCliOptions().add( "--settings" );
-            verifier.getCliOptions().add( new File( testDir, 
"user-settings.xml" ).getAbsolutePath() );
             verifier.getCliOptions().add( "--global-settings" );
             verifier.getCliOptions().add( new File( testDir, 
"global-settings.xml" ).getAbsolutePath() );
         }
+        else
+        {
+            Properties systemProperties = new Properties();
+            systemProperties.put( "org.apache.maven.global-settings", 
"global-settings.xml" );
+            verifier.setSystemProperties( systemProperties );
+        }
         verifier.executeGoal( 
"org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();