From ac3e841d103b8095cd0ecc22da40e0a40aa88764 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Sun, 15 Feb 2009 16:20:42 +0000 Subject: [PATCH] [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+ git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@744687 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java index 669030e8d3..ccfa7b56e9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java @@ -53,7 +53,7 @@ public class MavenITmng0294MergeGlobalAndUserSettingsTest 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" );