From da09d6f1ca35028f23a48390852dc1034d6487a8 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: Upgrades Apache Tez to compile and run with JDK 25

---
 build-tools/docker/Dockerfile  | 2 +-
 pom.xml                        | 5 +++--
 tez-dist/src/docker/Dockerfile | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build-tools/docker/Dockerfile b/build-tools/docker/Dockerfile
index 12fa58d890..63bee8dba2 100644
--- a/build-tools/docker/Dockerfile
+++ b/build-tools/docker/Dockerfile
@@ -106,7 +106,7 @@ RUN apk add --no-cache curl tar \
 ####################
 
 # Switching to eclipse-temurin to resolves cross-platform amd64/arm64 architecture issues
-FROM eclipse-temurin:21-jdk-noble AS tezbase
+FROM eclipse-temurin:25-jdk-noble AS tezbase
 
 WORKDIR /root
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/pom.xml b/pom.xml
index ccdc48d2d1..332084a724 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,8 +47,9 @@
     <!-- 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>
+    <version.maven-shade-plugin>3.6.2</version.maven-shade-plugin>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
     <failIfNoTests>false</failIfNoTests>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/tez-dist/src/docker/Dockerfile b/tez-dist/src/docker/Dockerfile
index 3d13f5e2b9..1db272e273 100644
--- a/tez-dist/src/docker/Dockerfile
+++ b/tez-dist/src/docker/Dockerfile
@@ -34,7 +34,7 @@ RUN mkdir -p /opt/tez \
         -C /opt/tez \
     && rm -rf /opt/tez-$TEZ_VERSION.tar.gz
 
-FROM eclipse-temurin:21-jdk-ubi9-minimal AS run
+FROM eclipse-temurin:25-jdk-ubi10-minimal AS run
 
 ARG UID=1000
 ARG TEZ_VERSION