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

[bentmann]

Author: bentmann
Date: Thu Nov 18 23:09:57 2010
New Revision: 1036676

URL: http://svn.apache.org/viewvc?rev=1036676&view=rev
Log:
[MNG-4850] [regression] several elements of server configuration in 
settings.xml are not honoured

o Enabled IT

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

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java?rev=1036676&r1=1036675&r2=1036676&view=diff
==============================================================================
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
 Thu Nov 18 23:09:57 2010
@@ -31,7 +31,7 @@ public class MavenITmng3600DeploymentMod
 
     public MavenITmng3600DeploymentModeDefaultsTest()
     {
-        super( "(2.1.0-M1,3.0-alpha-1),[3.0-alpha-7,)" );
+        super( "(2.1.0-M1,3.0-alpha-1),[3.0.1,)" );
     }
 
     public void testitMNG3600NoSettings()
@@ -77,8 +77,6 @@ public class MavenITmng3600DeploymentMod
     public void testitMNG3600ModesSet()
         throws Exception
     {
-        requiresMavenVersion( "(2.1.0-M1,3.0-alpha-1)" ); // due to MNG-4850
-
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/mng-3600" );
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );