From bc28ac69b389fb97e03df85de74d16b988a34c91 Mon Sep 17 00:00:00 2001
From: James Nord <jtnord@users.noreply.github.com>
Date: Mon, 8 Nov 2021 11:37:50 +0000
Subject: [PATCH] Do not reuse surefire (failsafe) forks

Reusing forks is a cause of flakyness in tests, especially ones with
JenkinsRules, as Jenkins iteslf has many things static that may get left
in a zombie like state in between tests.

At the same time update the surefire systemProperty configuration to the
non deprecated systemPropertyVariables and move the headless propery
defintion there.
---
 pom.xml | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index d4f358eaf4..742915e62d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <releaseProfiles> </releaseProfiles>
     <arguments> </arguments>
-    <argLine>-Xms768M -Xmx768M -Djava.awt.headless=true -XX:+HeapDumpOnOutOfMemoryError -XX:+TieredCompilation -XX:TieredStopAtLevel=1</argLine>
+    <argLine>-Xms768M -Xmx768M -XX:+HeapDumpOnOutOfMemoryError -XX:+TieredCompilation -XX:TieredStopAtLevel=1</argLine>
 
     <jenkins.version>2.204</jenkins.version>
     <jenkins-bom.version>${jenkins.version}</jenkins-bom.version>
@@ -731,17 +731,13 @@
         <configuration>
           <!-- SUREFIRE-1226 workaround -->
           <trimStackTrace>false</trimStackTrace>
-          <systemProperties>
-            <property>
-              <name>hudson.udp</name>
-              <value>-1</value>
-            </property>
-            <property>
-              <name>java.io.tmpdir</name>
-              <value>${surefireTempDir}</value>
-            </property>
-          </systemProperties>
+          <systemPropertyVariables>
+              <hudson.udp>-1</hudson.udp>
+              <java.io.tmpdir>${surefireTempDir}</java.io.tmpdir>
+              <java.awt.headless>true</java.awt.headless>
+          </systemPropertyVariables>
           <runOrder>alphabetical</runOrder>
+          <reuseForks>false</reuseForks>
         </configuration>
       </plugin>
       <plugin>
@@ -749,17 +745,13 @@
         <configuration>
           <!-- SUREFIRE-1226 workaround -->
           <trimStackTrace>false</trimStackTrace>
-          <systemProperties>
-            <property>
-              <name>hudson.udp</name>
-              <value>-1</value>
-            </property>
-            <property>
-              <name>java.io.tmpdir</name>
-              <value>${surefireTempDir}</value>
-            </property>
-          </systemProperties>
+          <systemPropertyVariables>
+              <hudson.udp>-1</hudson.udp>
+              <java.io.tmpdir>${surefireTempDir}</java.io.tmpdir>
+              <java.awt.headless>true</java.awt.headless>
+          </systemPropertyVariables>
           <runOrder>alphabetical</runOrder>
+          <reuseForks>false</reuseForks>
         </configuration>
       </plugin>
       <plugin>