From b16423455ef21b911284db2f3fee5690ff6ee059 Mon Sep 17 00:00:00 2001
From: Caideyipi <87789683+Caideyipi@users.noreply.github.com>
Date: Fri, 18 Sep 2026 18:45:06 +0800
Subject: [PATCH] Fix Surefire fork port isolation (#18676)

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

diff --git a/pom.xml b/pom.xml
index 082fa90a23e84..f81789a9c5ff5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -750,7 +750,7 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>3.1.2</version>
                     <configuration>
-                        <argLine>${argLine} -Xmx1024m</argLine>
+                        <argLine>${argLine} -Xmx1024m -Dsurefire.forkNumber=${surefire.forkNumber}</argLine>
                         <!-- Force the working directory to be different for each fork, so forks don't trample each other -->
                         <workingDirectory>${project.build.directory}/fork_${surefire.forkNumber}</workingDirectory>
                     </configuration>
@@ -1878,7 +1878,7 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <argLine>${argLine} @{surefire.jacoco.args} -Xmx1024m</argLine>
+                            <argLine>${argLine} @{surefire.jacoco.args} -Xmx1024m -Dsurefire.forkNumber=${surefire.forkNumber}</argLine>
                         </configuration>
                     </plugin>
                     <!-- for IT-->