From e944343a45ef5f411251fc3d6955e15410079941 Mon Sep 17 00:00:00 2001
From: Manuele Simi <manuele.simi@isti.cnr.it>
Date: Sun, 9 Aug 2020 17:09:36 -0400
Subject: [PATCH 1/2] Surefire plugin: migrate the deprecated forkMode
 parameter to forkCount and reuseForks.

---
 pom.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c4081df..a49e51a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -762,9 +762,13 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.0.0-M3</version>
+					<version>3.0.0-M5</version>
 					<configuration>
-						<forkMode>always</forkMode> <!-- integration tests require it -->
+						<parallel>classes</parallel> <!-- each class in its own JVM-->
+						<threadCountClasses>10</threadCountClasses>
+						<forkCount>3</forkCount> <!-- 3 JVMs at build time -->
+						<reuseForks>true</reuseForks> <!-- reuse the JVMs across classes -->
+						<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
 					</configuration>
 				</plugin>
 

From 0570f634ecd88c047c7ae77b4a03f94b6f1cac79 Mon Sep 17 00:00:00 2001
From: Manuele Simi <manuele.simi@isti.cnr.it>
Date: Tue, 11 Aug 2020 13:56:17 -0400
Subject: [PATCH 2/2] Define and use the project.test.outputDirectory property.

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a49e51a..165ec31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -768,7 +768,7 @@
 						<threadCountClasses>10</threadCountClasses>
 						<forkCount>3</forkCount> <!-- 3 JVMs at build time -->
 						<reuseForks>true</reuseForks> <!-- reuse the JVMs across classes -->
-						<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+						<reportsDirectory>${project.test.outputDirectory}</reportsDirectory>
 					</configuration>
 				</plugin>
 
@@ -1085,6 +1085,8 @@
 		<!-- default value for the distro directory -->
 		<distroDirectory>distro</distroDirectory>
 
+		<project.test.outputDirectory>${project.build.directory}/surefire-reports</project.test.outputDirectory>
+
 		<java_version>1.8</java_version>
 		<java.expected.vm>.*OpenJDK.*</java.expected.vm>
 		<maven.compiler.source>${java_version}</maven.compiler.source>