From 1522319c0654590df290ef6951a2d2478941bcba Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 4 Jan 2012 20:25:03 +0000 Subject: [PATCH] use surefire 2.11, MNG-5224 not yet merged in 3.0.4 RC branch so 3.0.5 range git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@1227303 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/it/MavenITmng5224InjectedSettings.java | 5 ++--- its/pom.xml | 12 ++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java index cf6e61aaa6..e0fff00621 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java @@ -44,8 +44,8 @@ public class MavenITmng5224InjectedSettings 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 MavenITmng5224InjectedSettings Verifier verifier = newVerifier( testDir.getAbsolutePath() ); - verifier.getCliOptions().add( "-U" ); verifier.getCliOptions().add( "--settings" ); verifier.getCliOptions().add( "settings.xml" ); //verifier. diff --git a/its/pom.xml b/its/pom.xml index c43ae1aa3b..44c264a484 100644 --- a/its/pom.xml +++ b/its/pom.xml @@ -52,6 +52,18 @@ under the License. https://builds.apache.org/hudson/view/M-R/view/Maven/job/core-integration-testing-maven-3-trunk/ + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.11 + + + + + apache.snapshots