From 4735d38d7bfdbbed6d5b2f0fae6c6c6629a5dc12 Mon Sep 17 00:00:00 2001
From: jbertram <jbertram@apache.org>
Date: Wed, 6 May 2015 11:15:33 -0500
Subject: [PATCH] Update surefire plugin versions

---
 pom.xml                   | 4 ++--
 tests/extra-tests/pom.xml | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5bf0be8912..fa845b6572 100644
--- a/pom.xml
+++ b/pom.xml
@@ -726,7 +726,7 @@
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
-               <version>2.14.1</version>
+               <version>2.18.1</version>
                <configuration>
                   <forkMode>once</forkMode>
                   <testFailureIgnore>true</testFailureIgnore>
@@ -738,7 +738,7 @@
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-report-plugin</artifactId>
-               <version>2.14.1</version>
+               <version>2.18.1</version>
             </plugin>
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>
diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml
index 8727e62ff9..7d7e2cc326 100644
--- a/tests/extra-tests/pom.xml
+++ b/tests/extra-tests/pom.xml
@@ -211,6 +211,7 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.18.1</version>
             <configuration>
                <skipTests>${skipExtraTests}</skipTests>
                <!-- ensure we don't inherit a byteman jar form any env settings -->
@@ -239,11 +240,15 @@
                </systemProperties>
                <!-- make sure maven puts the byteman jar in the classpath rather than in a manifest jar -->
                <useManifestOnlyJar>false</useManifestOnlyJar>
-               <forkMode>once</forkMode>
+               <!-- when upgrading this plugin from 2.4 to 2.18.1 <forkMode>once</forkMode> was replaced with these: -->
+               <forkCount>1</forkCount>
+               <reuseForks>true</reuseForks>
                <!--
                <debugForkedProcess>true</debugForkedProcess>
                -->
-               <parallel>false</parallel>
+
+               <!-- the option <parallel>false</parallel> is not supported after the plugin upgrade from 2.4 to 2.18.1 -->
+
                <!--<argLine>${activemq-surefire-argline} -Dorg.jboss.byteman.verbose -Dorg.jboss.byteman.contrib.bmunit.verbose</argLine>-->
                <!-- '-noverify' is needed here to fix VerifyErrors on ScaleDownFailoverTest and ScaleDownFailureTest (and their subclasses). I got the tip from https://issues.jboss.org/browse/BYTEMAN-248. -->
                <argLine>${activemq-surefire-argline} -noverify</argLine>