From 14ea0d498aadff6ff5c606571d08b02f373a4bbc Mon Sep 17 00:00:00 2001
From: liangbowen <liangbowen@gf.com.cn>
Date: Fri, 13 Oct 2023 22:42:47 +0800
Subject: [PATCH] change to use `spark.binary.version` for hudi dependency by
 default

---
 pom.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2e9fa9e52ad..4c4dc518401 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
         <httpclient.version>4.5.14</httpclient.version>
         <httpcore.version>4.4.16</httpcore.version>
         <hudi.version>0.14.0</hudi.version>
-        <hudi.spark.binary.version>3.4</hudi.spark.binary.version>
+        <hudi.spark.binary.version>${spark.binary.version}</hudi.spark.binary.version>
         <iceberg.version>1.4.0</iceberg.version>
         <jackson.version>2.15.0</jackson.version>
         <jakarta.servlet-api.version>4.0.4</jakarta.servlet-api.version>
@@ -196,8 +196,7 @@
         <snakeyaml.version>2.2</snakeyaml.version>
         <!--
           DO NOT forget to change the following properties when change the minor version of Spark:
-          `delta.version`, `maven.plugin.scalatest.exclude.tags`,
-          `hudi.version`, `hudi.spark.binary.version`
+          `delta.version`, `maven.plugin.scalatest.exclude.tags`
           -->
         <spark.version>3.4.1</spark.version>
         <spark.binary.version>3.4</spark.binary.version>
@@ -2201,7 +2200,6 @@
             <properties>
                 <spark.version>3.1.3</spark.version>
                 <spark.binary.version>3.1</spark.binary.version>
-                <hudi.spark.binary.version>3.1</hudi.spark.binary.version>
                 <delta.version>1.0.1</delta.version>
                 <!-- Iceberg removed the support for Spark 3.1 in apache/iceberg#8661 since 1.4.0 -->
                 <iceberg.version>1.3.1</iceberg.version>
@@ -2219,7 +2217,6 @@
             <properties>
                 <spark.version>3.2.4</spark.version>
                 <spark.binary.version>3.2</spark.binary.version>
-                <hudi.spark.binary.version>3.2</hudi.spark.binary.version>
                 <delta.version>2.0.2</delta.version>
                 <spark.archive.name>spark-${spark.version}-bin-hadoop3.2${spark.archive.scala.suffix}.tgz</spark.archive.name>
                 <maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow</maven.plugin.scalatest.exclude.tags>
@@ -2237,7 +2234,6 @@
                 <delta.version>2.3.0</delta.version>
                 <spark.version>3.3.3</spark.version>
                 <spark.binary.version>3.3</spark.binary.version>
-                <hudi.spark.binary.version>3.3</hudi.spark.binary.version>
                 <maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow</maven.plugin.scalatest.exclude.tags>
             </properties>
         </profile>
@@ -2252,7 +2248,6 @@
                 <delta.version>2.4.0</delta.version>
                 <spark.version>3.4.1</spark.version>
                 <spark.binary.version>3.4</spark.binary.version>
-                <hudi.spark.binary.version>3.4</hudi.spark.binary.version>
                 <maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow,org.apache.kyuubi.tags.IcebergTest,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.HudiTest</maven.plugin.scalatest.exclude.tags>
             </properties>
         </profile>
@@ -2264,9 +2259,10 @@
             </modules>
             <properties>
                 <delta.version>2.4.0</delta.version>
+                <!-- Remove this when Hudi supports Spark 3.5 -->
+                <hudi.spark.binary.version>3.4</hudi.spark.binary.version>
                 <spark.version>3.5.0</spark.version>
                 <spark.binary.version>3.5</spark.binary.version>
-                <hudi.spark.binary.version>3.4</hudi.spark.binary.version>
                 <maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest,org.apache.kyuubi.tags.PySparkTest</maven.plugin.scalatest.exclude.tags>
             </properties>
         </profile>