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

[jdcasey]

Author: jdcasey
Date: Thu Sep 10 20:06:25 2009
New Revision: 813571

URL: http://svn.apache.org/viewvc?rev=813571&view=rev
Log:
enable MNG-4347 (and MNG-4148, in the same class) tests inside the suite.

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

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=813571&r1=813570&r2=813571&view=diff
==============================================================================
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
 Thu Sep 10 20:06:25 2009
@@ -89,9 +89,7 @@
         suite.addTestSuite( 
MavenITmng4349RelocatedArtifactWithInvalidPomTest.class );
         suite.addTestSuite( 
MavenITmng4348NoUnnecessaryRepositoryAccessTest.class );
 
-        // TODO: enable after maven-2.2.x-MNG-4347 is merged.
-        // 
http://svn.apache.org/repos/asf/maven/maven-2/branches/maven-2.2.x-MNG-4347/
-        // suite.addTestSuite( 
MavenITmng4347ImportScopeWithSettingsProfilesTest.class );
+        suite.addTestSuite( 
MavenITmng4347ImportScopeWithSettingsProfilesTest.class );
         suite.addTestSuite( 
MavenITmng4345DefaultPluginExecutionOrderTest.class );
         suite.addTestSuite( 
MavenITmng4344ManagedPluginExecutionOrderTest.class );
         suite.addTestSuite( 
MavenITmng4342IndependentMojoParameterDefaultValuesTest.class );