From 6773889435aa4e7633cee661522115029f444ae1 Mon Sep 17 00:00:00 2001
From: Mahesh Raju Somalaraju <maheshraju.onos@gmail.com>
Date: Tue, 10 Mar 2026 18:24:53 +0530
Subject: [PATCH] TEZ-4677: JDK25 testing in yetus

---
 Jenkinsfile                          |  4 ++--
 build-tools/docker/Dockerfile        | 10 +++++-----
 pom.xml                              |  4 ++--
 tez-plugins/tez-aux-services/pom.xml |  8 ++++++++
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f3f895f313..394dcd7560 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -147,8 +147,8 @@ pipeline {
                         # help keep the ASF boxes clean
                         YETUS_ARGS+=("--sentinel")
 
-                        # test with Java 21
-                        YETUS_ARGS+=("--java-home=/usr/lib/jvm/java-21-openjdk-amd64")
+                        # test with Java 25
+                        YETUS_ARGS+=("--java-home=/usr/lib/jvm/java-25-openjdk-amd64")
                         YETUS_ARGS+=("--debug")
 
                         # write Yetus report as GitHub comment (YETUS-1102)
diff --git a/build-tools/docker/Dockerfile b/build-tools/docker/Dockerfile
index 5441889d16..41690b7d97 100644
--- a/build-tools/docker/Dockerfile
+++ b/build-tools/docker/Dockerfile
@@ -162,18 +162,18 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ####
 
 ####
-# OpenJDK 21
+# OpenJDK 25
 # hadolint ignore=DL3008
 RUN apt-get -q update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y openjdk-21-jdk \
+    && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y openjdk-25-jdk \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Set JAVA_HOME and PATH environment variables
-ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
+# Set JAVA_HOME and PATH environment variables for JDK 25
+ENV JAVA_HOME=/usr/lib/jvm/java-25-openjdk-amd64
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 # Set the default Java version using update-alternatives
-RUN update-alternatives --install /usr/bin/java java /usr/lib/jvm/java-21-openjdk-amd64/bin/java 1
+RUN update-alternatives --install /usr/bin/java java /usr/lib/jvm/java-25-openjdk-amd64/bin/java 1
 
 #######
 # Install SpotBugs 4.9.3
diff --git a/pom.xml b/pom.xml
index d576ddbb46..aef285e4d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,8 @@
     <!-- Build Properties -->
     <!-- Default empty argLine to prevent Surefire crashes when the 'jacoco' profile is inactive -->
     <argLine/>
-    <javaVersion>21</javaVersion>
-    <maven.compiler.release>21</maven.compiler.release>
+    <javaVersion>25</javaVersion>
+    <maven.compiler.release>25</maven.compiler.release>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
     <failIfNoTests>false</failIfNoTests>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/tez-plugins/tez-aux-services/pom.xml b/tez-plugins/tez-aux-services/pom.xml
index d935d8ef74..7207765257 100644
--- a/tez-plugins/tez-aux-services/pom.xml
+++ b/tez-plugins/tez-aux-services/pom.xml
@@ -195,6 +195,14 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
+        <version>3.6.2</version>
+        <dependencies>
+          <dependency>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm</artifactId>
+          <version>9.8</version>
+          </dependency>
+        </dependencies>
         <executions>
           <execution>
             <phase>package</phase>