Author: olamy
Date: Wed Jan 4 20:25:03 2012
New Revision: 1227303
URL: http://svn.apache.org/viewvc?rev=1227303&view=rev
Log:
use surefire 2.11, MNG-5224 not yet merged in 3.0.4 RC branch so 3.0.5 range
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java
maven/core-integration-testing/trunk/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java?rev=1227303&r1=1227302&r2=1227303&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java
Wed Jan 4 20:25:03 2012
@@ -44,8 +44,8 @@ public class MavenITmng5224InjectedSetti
public MavenITmng5224InjectedSettings()
{
- // olamy probably doesn't work with 3.x before 3.0.4
- super( "[2.0.3,3.0-alpha-1),[3.0.4,)" );
+ // olamy probably doesn't work with 3.x before 3.0.5
+ super( "[2.0.3,3.0-alpha-1),[3.0.5,)" );
}
@@ -59,7 +59,6 @@ public class MavenITmng5224InjectedSetti
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.getCliOptions().add( "-U" );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
//verifier.
Modified: maven/core-integration-testing/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/pom.xml?rev=1227303&r1=1227302&r2=1227303&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/pom.xml (original)
+++ maven/core-integration-testing/trunk/pom.xml Wed Jan 4 20:25:03 2012
@@ -52,6 +52,18 @@ under the License.
<url>https://builds.apache.org/hudson/view/M-R/view/Maven/job/core-integration-testing-maven-3-trunk/</url>
</ciManagement>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.11</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<repositories>
<repository>
<id>apache.snapshots</id>
