From 592c7c502a773fc8f9d34d255673acf309af06eb Mon Sep 17 00:00:00 2001
From: Raghav Aggarwal <raghavaggarwal03.ra@gmail.com>
Date: Tue, 17 Mar 2026 22:06:45 +0530
Subject: [PATCH 1/2] TEZ-4695: Consolidate surefire plugin config to remove
 redundant surefire blocks

---
 pom.xml                       |  4 ++--
 tez-dag/pom.xml               |  4 +---
 tez-ext-service-tests/pom.xml | 10 ----------
 tez-tests/pom.xml             | 10 ----------
 4 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2b295473eb..6fd7a46c87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -959,11 +959,11 @@
             <reuseForks>false</reuseForks>
             <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
             <testFailureIgnore>true</testFailureIgnore>
-            <argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError</argLine>
-            <argLine>${test.jvm.args}</argLine>
+            <argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError ${test.jvm.args}</argLine>
             <environmentVariables>
               <JAVA_HOME>${java.home}</JAVA_HOME>
               <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
+              <LOG_DIRS>${test.log.dir}</LOG_DIRS>
             </environmentVariables>
             <systemPropertyVariables>
               <test.build.data>${test.build.data}</test.build.data>
diff --git a/tez-dag/pom.xml b/tez-dag/pom.xml
index 10579f2c5b..c4af9b95a7 100644
--- a/tez-dag/pom.xml
+++ b/tez-dag/pom.xml
@@ -209,9 +209,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <argLine>${test.jvm.args}</argLine>
-          <environmentVariables>
-            <LOG_DIRS>${test.log.dir}</LOG_DIRS>
+          <environmentVariables combine.children="append">
             <TEZ_AM_EXTERNAL_ID>test-external-id</TEZ_AM_EXTERNAL_ID>
           </environmentVariables>
         </configuration>
diff --git a/tez-ext-service-tests/pom.xml b/tez-ext-service-tests/pom.xml
index c85f542289..5d7af433f0 100644
--- a/tez-ext-service-tests/pom.xml
+++ b/tez-ext-service-tests/pom.xml
@@ -157,16 +157,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>${test.jvm.args}</argLine>
-          <environmentVariables>
-            <LOG_DIRS>${test.log.dir}</LOG_DIRS>
-          </environmentVariables>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
diff --git a/tez-tests/pom.xml b/tez-tests/pom.xml
index 25e82c66ba..33241c6ee9 100644
--- a/tez-tests/pom.xml
+++ b/tez-tests/pom.xml
@@ -156,16 +156,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>${test.jvm.args}</argLine>
-          <environmentVariables>
-            <LOG_DIRS>${test.log.dir}</LOG_DIRS>
-          </environmentVariables>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>

From fc230c5cd85d238b11513926c06e6418008abcd5 Mon Sep 17 00:00:00 2001
From: Raghav Aggarwal <raghavaggarwal03.ra@gmail.com>
Date: Thu, 19 Mar 2026 01:11:50 +0530
Subject: [PATCH 2/2] Review comment and remove test.log.dir propeties from
 child pom

---
 pom.xml                       | 19 ++++++++++---------
 tez-dag/pom.xml               | 10 ----------
 tez-ext-service-tests/pom.xml |  4 ----
 tez-tests/pom.xml             |  4 ----
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6fd7a46c87..542d96180f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,14 +105,8 @@
     <snappy-java.version>1.1.10.4</snappy-java.version>
     <spotless-maven-plugin.version>3.1.0</spotless-maven-plugin.version>
     <test.build.data>${project.build.directory}/tmp</test.build.data>
+    <test.log.dir>${project.build.directory}/logs</test.log.dir>
     <wro4j-maven-plugin.version>1.7.9</wro4j-maven-plugin.version>
-    <test.jvm.args>
-      --add-opens=java.base/java.lang=ALL-UNNAMED
-      --add-opens=java.base/java.util=ALL-UNNAMED
-      --add-opens java.base/java.io=ALL-UNNAMED
-      -Dnet.bytebuddy.experimental=true
-    </test.jvm.args>
-
     <maven.javadoc.skip>true</maven.javadoc.skip> <!-- enabled only in relevant modules separately -->
   </properties>
   <scm>
@@ -959,11 +953,18 @@
             <reuseForks>false</reuseForks>
             <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
             <testFailureIgnore>true</testFailureIgnore>
-            <argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError ${test.jvm.args}</argLine>
+            <argLine>
+              -XX:+HeapDumpOnOutOfMemoryError
+              --add-opens=java.base/java.lang=ALL-UNNAMED
+              --add-opens=java.base/java.util=ALL-UNNAMED
+              --add-opens=java.base/java.io=ALL-UNNAMED
+              -Dnet.bytebuddy.experimental=true
+            </argLine>
             <environmentVariables>
               <JAVA_HOME>${java.home}</JAVA_HOME>
-              <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
               <LOG_DIRS>${test.log.dir}</LOG_DIRS>
+              <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
+              <TEZ_AM_EXTERNAL_ID>test-external-id</TEZ_AM_EXTERNAL_ID>
             </environmentVariables>
             <systemPropertyVariables>
               <test.build.data>${test.build.data}</test.build.data>
diff --git a/tez-dag/pom.xml b/tez-dag/pom.xml
index c4af9b95a7..908b281b68 100644
--- a/tez-dag/pom.xml
+++ b/tez-dag/pom.xml
@@ -31,7 +31,6 @@
     org.apache.tez.dag.app.rm.container.AMContainerImpl</tez.dag.state.classes>
     <tez.graphviz.title>Tez</tez.graphviz.title>
     <tez.graphviz.output.file>Tez.gv</tez.graphviz.output.file>
-    <test.log.dir>${project.build.directory}/logs</test.log.dir>
   </properties>
   <artifactId>tez-dag</artifactId>
 
@@ -205,15 +204,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <environmentVariables combine.children="append">
-            <TEZ_AM_EXTERNAL_ID>test-external-id</TEZ_AM_EXTERNAL_ID>
-          </environmentVariables>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>com.github.os72</groupId>
         <artifactId>protoc-jar-maven-plugin</artifactId>
diff --git a/tez-ext-service-tests/pom.xml b/tez-ext-service-tests/pom.xml
index 5d7af433f0..0231a7a0d9 100644
--- a/tez-ext-service-tests/pom.xml
+++ b/tez-ext-service-tests/pom.xml
@@ -25,10 +25,6 @@
 
   <artifactId>tez-ext-service-tests</artifactId>
 
-  <properties>
-    <test.log.dir>${project.build.directory}/logs</test.log.dir>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>io.netty</groupId>
diff --git a/tez-tests/pom.xml b/tez-tests/pom.xml
index 33241c6ee9..cf76bdd3bd 100644
--- a/tez-tests/pom.xml
+++ b/tez-tests/pom.xml
@@ -24,10 +24,6 @@
   </parent>
   <artifactId>tez-tests</artifactId>
 
-  <properties>
-    <test.log.dir>${project.build.directory}/logs</test.log.dir>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.tez</groupId>