From 4dc9d050f15aaae7f7c17c9929a4c6bf16eb7b33 Mon Sep 17 00:00:00 2001
From: Kousuke Saruta <sarutak@amazon.co.jp>
Date: Sat, 4 Apr 2026 22:43:08 +0900
Subject: [PATCH] Fix release build

---
 pom.xml                  | 3 ++-
 project/SparkBuild.scala | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e0f85807103c..12a90a80e3d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -239,6 +239,7 @@
     <leveldbjni.group>org.fusesource.leveldbjni</leveldbjni.group>
     <kubernetes-client.version>7.6.1</kubernetes-client.version>
     <vertx.version>4.5.26</vertx.version>
+    <xz.version>1.12</xz.version>
 
     <test.java.home>${java.home}</test.java.home>
 
@@ -1602,7 +1603,7 @@
       <dependency>
         <groupId>org.tukaani</groupId>
         <artifactId>xz</artifactId>
-        <version>1.12</version>
+        <version>${xz.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.zookeeper</groupId>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 504beb8e61d2..c92470c80d94 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -1200,11 +1200,14 @@ object DependencyOverrides {
         SbtPomKeys.effectivePom.value.getProperties.get("avro.version").asInstanceOf[String]
       val slf4jVersion =
         SbtPomKeys.effectivePom.value.getProperties.get("slf4j.version").asInstanceOf[String]
+      val xzVersion =
+        SbtPomKeys.effectivePom.value.getProperties.get("xz.version").asInstanceOf[String]
       Seq(
         "com.google.guava" % "guava" % guavaVersion,
         "jline" % "jline" % jlineVersion,
         "org.apache.avro" % "avro" % avroVersion,
         "org.slf4j" % "slf4j-api" % slf4jVersion,
+        "org.tukaani" % "xz" % xzVersion,
         "org.scala-lang" % "scalap" % scalaVersion.value
       ) ++ jacksonDeps.key.value
     }
@@ -1222,7 +1225,9 @@ object ExcludedDependencies {
       ExclusionRule(organization = "ch.qos.logback"),
       ExclusionRule("org.lz4", "lz4-java"),
       ExclusionRule("org.slf4j", "slf4j-simple"),
-      ExclusionRule("javax.servlet", "javax.servlet-api"))
+      ExclusionRule("javax.servlet", "javax.servlet-api"),
+      ExclusionRule("io.netty", "netty-codec-protobuf"),
+      ExclusionRule("io.netty", "netty-codec-marshalling"))
   )
 }