From bc702e087e9f95b9e45e2f8d0259dba98613a01a Mon Sep 17 00:00:00 2001
From: Sebastian Baunsgaard <baunsgaard@apache.org>
Date: Thu, 28 May 2026 09:55:25 +0000
Subject: [PATCH] [MINOR] Upgrade Surefire to 3.5.2 and enforce fork exit
 timeout

Fix intermittent ~26 minute hangs in the **.component.c**.** GitHub
Actions job. The forks were finishing their test classes but failing
to exit cleanly (leaked non-daemon threads from test executors), and
Surefire 3.0.0 did not reliably enforce its fork shutdown timeout.

- Bump maven-surefire-plugin from 3.0.0 to 3.5.2.
- Set forkedProcessExitTimeoutInSeconds=30 so a fork that still has
  live threads after its test class completes is forcibly killed
  instead of stalling the run.
- Set enableProcessChecker=native so each fork detects a dead parent
  and self-terminates, and Surefire can more reliably kill stuck
  forks on Linux.

Verified across a full Java test matrix: component.c is stable, no
job exceeds its 30 minute cap, and aggregate compute is unchanged.
---
 pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c4206532a62..dc9783f8571 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
 		<slf4j.version>2.0.11</slf4j.version>
 		<log4j.version>2.22.1</log4j.version>
 		<maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
-		<maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
         <maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
 		<maven-remote-resources-plugin.version>3.0.0</maven-remote-resources-plugin.version>
 		<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
@@ -410,6 +410,10 @@
 					<reuseForks>false</reuseForks>
 					<!-- Kill hung test forks before CI cancels the whole job. -->
 					<forkedProcessTimeoutInSeconds>${test-forkedProcessTimeout}</forkedProcessTimeoutInSeconds>
+					<!-- Force-kill forks that still have live threads after the test class completes. -->
+					<forkedProcessExitTimeoutInSeconds>30</forkedProcessExitTimeoutInSeconds>
+					<!-- Let forks detect a dead parent and self-terminate. -->
+					<enableProcessChecker>native</enableProcessChecker>
 					<!-- <reportFormat>brief</reportFormat> -->
 					<trimStackTrace>true</trimStackTrace>
 					<rerunFailingTestsCount>${rerun.failing.tests.count}</rerunFailingTestsCount>