From 251fa94e54a928bcd9898fd9b7cb382020cd1dcd Mon Sep 17 00:00:00 2001
From: Shilun Fan <slfan1989@apache.org>
Date: Wed, 3 Apr 2024 23:02:09 +0800
Subject: [PATCH 1/3] TEZ-4549. Upgrade Hadoop Version to 3.4.0.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a006c97ce2..d5d367c6c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
     <findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version>
     <frontend-maven-plugin.version>1.8.0</frontend-maven-plugin.version>
     <guava.version>32.0.1-jre</guava.version>
-    <hadoop.version>3.3.6</hadoop.version>
+    <hadoop.version>3.4.0</hadoop.version>
     <jdk.tools.version>1.8</jdk.tools.version>
     <jersey.version>1.19.4</jersey.version>
     <jettison.version>1.5.4</jettison.version>

From 4f3ea6119b393c2bf42c30568821b7bdf6d4004d Mon Sep 17 00:00:00 2001
From: Ayush Saxena <ayushsaxena@apache.org>
Date: Thu, 19 Dec 2024 05:13:56 +0530
Subject: [PATCH 2/3] Upgrade to 3.4.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d5d367c6c3..c92bc76a48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
     <findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version>
     <frontend-maven-plugin.version>1.8.0</frontend-maven-plugin.version>
     <guava.version>32.0.1-jre</guava.version>
-    <hadoop.version>3.4.0</hadoop.version>
+    <hadoop.version>3.4.1</hadoop.version>
     <jdk.tools.version>1.8</jdk.tools.version>
     <jersey.version>1.19.4</jersey.version>
     <jettison.version>1.5.4</jettison.version>

From 2664d8149ae02d3b90403d527e679a5825cabb71 Mon Sep 17 00:00:00 2001
From: Ayush Saxena <ayushsaxena@apache.org>
Date: Sun, 22 Dec 2024 11:09:48 +0530
Subject: [PATCH 3/3] Exclude Avro from Hadoop-Common

---
 tez-ext-service-tests/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tez-ext-service-tests/pom.xml b/tez-ext-service-tests/pom.xml
index 23d3c10231..532588a9ce 100644
--- a/tez-ext-service-tests/pom.xml
+++ b/tez-ext-service-tests/pom.xml
@@ -45,6 +45,12 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.avro</groupId>
+          <artifactId>avro</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>