From b75d930fc7d1ea48d3bdb313175722ec4599af05 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 8 Mar 2013 14:35:38 -0500
Subject: [PATCH] Surefire 2.14.

---
 pom.xml      | 2 +-
 test/pom.xml | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 354ef1abe5..d611a6ce61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -340,7 +340,7 @@ THE SOFTWARE.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.13</version> <!-- ignoring ${maven-surefire-plugin.version} -->
+          <version>2.14</version> <!-- ignoring ${maven-surefire-plugin.version} -->
           <configuration>
             <systemPropertyVariables>
               <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
diff --git a/test/pom.xml b/test/pom.xml
index d34072d149..d009e15f03 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 The MIT License
 
@@ -40,7 +40,7 @@ THE SOFTWARE.
   </description>
 
   <properties>
-    <concurrency>2</concurrency>
+    <concurrency>2</concurrency> <!-- may use e.g. 2C for 2 × (number of cores) -->
     <mavenDebug>false</mavenDebug>
   </properties>
 
@@ -182,9 +182,8 @@ THE SOFTWARE.
               <hudson.maven.debug>${mavenDebug}</hudson.maven.debug>
               <buildDirectory>${project.build.directory}</buildDirectory>
           </systemPropertyVariables>
-          <forkMode>perthread</forkMode> <!-- XXX https://jira.codehaus.org/browse/SUREFIRE-946 so use kill -9 to stop -->
-          <reuseForks>true</reuseForks> <!-- https://jira.codehaus.org/browse/SUREFIRE-751 -->
-          <threadCount>${concurrency}</threadCount> <!-- XXX https://jira.codehaus.org/browse/SUREFIRE-947 -->
+          <reuseForks>true</reuseForks>
+          <forkCount>${concurrency}</forkCount>
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
         </configuration>
       </plugin>
-- 
GitLab