Author: bentmann Date: Tue Dec 9 02:03:25 2008 New Revision: 724653 URL: http://svn.apache.org/viewvc?rev=724653&view=rev Log: o Reverted r724588 and r724590 to enable ITs for Maven 2.x (the issues in question are regressions in Maven 3.x, the features under test mostly work since Maven 2.0.1)
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java?rev=724653&r1=724652&r2=724653&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java Tue Dec 9 02:03:25 2008 @@ -35,13 +35,11 @@ extends AbstractMavenIntegrationTestCase { - public MavenITmng3821EqualPluginExecIdsTest() { - super( "(2.99,)" ); // only test in 3.0+ - } + } - /** + /** * Verify that using the same id for executions/reportsets of different plugins doesn't blow up the project * builder. */ Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java?rev=724653&r1=724652&r2=724653&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java Tue Dec 9 02:03:25 2008 @@ -38,7 +38,6 @@ public MavenITmng3843PomInheritanceTest() { - super( "(2.99,)" ); // only test in 3.0+ } /** Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java?rev=724653&r1=724652&r2=724653&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java Tue Dec 9 02:03:25 2008 @@ -38,7 +38,6 @@ public MavenITmng3853ProfileInjectedDistReposTest() { - super( "(2.99,)" ); // only test in 3.0+ } /**