From 94e2b8eb959c8d7559edd13d7ebe2c0637bf8ab9 Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@apache.org>
Date: Tue, 6 Feb 2024 17:06:41 +0200
Subject: [PATCH] Use maven-surefire 2.8.1 for certain tests

---
 tests/integration-tests-base-groovy/pom.xml | 28 ++++++++++++++--
 tests/integration-tests-utils/pom.xml       | 36 +++++++++++++++++++--
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/tests/integration-tests-base-groovy/pom.xml b/tests/integration-tests-base-groovy/pom.xml
index 5106007d6c3..9403a03bd90 100644
--- a/tests/integration-tests-base-groovy/pom.xml
+++ b/tests/integration-tests-base-groovy/pom.xml
@@ -36,6 +36,25 @@
   </properties>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <!-- DO NOT CHANGE VERSION
+               Versions newer than 2.8.1 do not respect useSystemClassLoader=false
+               https://issues.apache.org/jira/browse/SUREFIRE-1476 //-->
+          <version>2.8.1</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.surefire</groupId>
+              <artifactId>surefire-junit4</artifactId>
+              <version>2.8.1</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -79,10 +98,15 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
+        <version>2.8.1</version>
+        <configuration combine.self="override">
           <argLine>-Xmx4G -Djava.net.preferIPv4Stack=true ${test.additional.args}</argLine>
-          <forkCount>1</forkCount>
+          <forkMode>once</forkMode>
           <useSystemClassLoader>false</useSystemClassLoader>
+          <argLine>-Xmx2G -Djava.net.preferIPv4Stack=true -Dio.netty.leakDetection.level=paranoid ${test.additional.args}</argLine>
+          <redirectTestOutputToFile>${redirectTestOutputToFile}</redirectTestOutputToFile>
+          <trimStackTrace>false</trimStackTrace>
+          <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
           <systemPropertyVariables>
             <!-- only takes effect in later simpleLogger versions (1.7+) //-->
             <org.slf4j.simpleLogger.logFile>System.out</org.slf4j.simpleLogger.logFile>
diff --git a/tests/integration-tests-utils/pom.xml b/tests/integration-tests-utils/pom.xml
index 90034983d8f..fb83a7ce579 100644
--- a/tests/integration-tests-utils/pom.xml
+++ b/tests/integration-tests-utils/pom.xml
@@ -78,15 +78,45 @@
 
   </dependencies>
 
+
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <!-- DO NOT CHANGE VERSION
+               Versions newer than 2.8.1 do not respect useSystemClassLoader=false
+               https://issues.apache.org/jira/browse/SUREFIRE-1476 //-->
+          <version>2.8.1</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.surefire</groupId>
+              <artifactId>surefire-junit4</artifactId>
+              <version>2.8.1</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkCount>1</forkCount>
-          <reuseForks>false</reuseForks>
+        <version>2.8.1</version>
+        <configuration combine.self="override">
+          <argLine>-Xmx4G -Djava.net.preferIPv4Stack=true ${test.additional.args}</argLine>
+          <forkMode>once</forkMode>
           <useSystemClassLoader>false</useSystemClassLoader>
+          <argLine>-Xmx2G -Djava.net.preferIPv4Stack=true -Dio.netty.leakDetection.level=paranoid ${test.additional.args}</argLine>
+          <redirectTestOutputToFile>${redirectTestOutputToFile}</redirectTestOutputToFile>
+          <trimStackTrace>false</trimStackTrace>
+          <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
+          <classpathDependencyExcludes>
+            <classpathDependencyExclude>org.junit.platform:*</classpathDependencyExclude>
+            <classpathDependencyExclude>org.junit.vintage:*</classpathDependencyExclude>
+            <classpathDependencyExclude>org.junit.jupiter:*</classpathDependencyExclude>
+          </classpathDependencyExcludes>
         </configuration>
       </plugin>
     </plugins>