From e47b4793aabbd36c6ed5b610e45f384b9df0a1ac Mon Sep 17 00:00:00 2001
From: Raymond Xu <2701446+xushiyan@users.noreply.github.com>
Date: Mon, 10 Jan 2022 15:01:05 -0800
Subject: [PATCH 1/2] [HUDI-3195] Fix spark 3 pom

- drop 3.0.x profile
- update readme
- update build CI bot.yml
---
 .github/workflows/bot.yml |  4 ++--
 README.md                 |  5 +----
 pom.xml                   | 19 +++++++++++++++++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index f1f178e1716b9..52c077a09898a 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -21,9 +21,9 @@ jobs:
           - scala: "scala-2.11"
             spark: "spark2,spark-shade-unbundle-avro"
           - scala: "scala-2.12"
-            spark: "spark3,spark3.0.x"
+            spark: "spark3.0.x"
           - scala: "scala-2.12"
-            spark: "spark3,spark3.0.x,spark-shade-unbundle-avro"
+            spark: "spark3.0.x,spark-shade-unbundle-avro"
           - scala: "scala-2.12"
             spark: "spark3"
           - scala: "scala-2.12"
diff --git a/README.md b/README.md
index 4f48fc6c7f9bf..4bc2708e17454 100644
--- a/README.md
+++ b/README.md
@@ -83,12 +83,9 @@ mvn clean package -DskipTests -Dscala-2.12
 The default Spark version supported is 2.4.4. To build for different Spark 3 versions, use the corresponding profile
 
 ```
-# Build against Spark 3.2.0 (default build shipped with the public jars)
+# Build against Spark 3.1.2 (the default build shipped with the public Spark 3 bundle)
 mvn clean package -DskipTests -Dspark3
 
-# Build against Spark 3.1.2
-mvn clean package -DskipTests -Dspark3.1.x
-
 # Build against Spark 3.0.3
 mvn clean package -DskipTests -Dspark3.0.x
 ```
diff --git a/pom.xml b/pom.xml
index cd1825d61c03a..6e87c00037165 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1590,12 +1590,27 @@
 
     <profile>
       <id>spark3.0.x</id>
-<!--      for spark 3.0.x we need override the follow propeprties to package and run test-->
       <properties>
-        <spark3.version>3.0.0</spark3.version>
+        <spark3.version>3.0.3</spark3.version>
         <spark.version>${spark3.version}</spark.version>
+        <sparkbundle.version>${spark3bundle.version}</sparkbundle.version>
+        <scala.version>${scala12.version}</scala.version>
+        <scala.binary.version>2.12</scala.binary.version>
+        <hudi.spark.module>hudi-spark3</hudi.spark.module>
         <scalatest.version>3.0.1</scalatest.version>
+        <kafka.version>2.4.1</kafka.version>
+        <fasterxml.version>${fasterxml.spark3.version}</fasterxml.version>
+        <fasterxml.jackson.databind.version>${fasterxml.spark3.version}</fasterxml.jackson.databind.version>
+        <fasterxml.jackson.module.scala.version>${fasterxml.spark3.version}</fasterxml.jackson.module.scala.version>
+        <fasterxml.jackson.dataformat.yaml.version>${fasterxml.spark3.version}</fasterxml.jackson.dataformat.yaml.version>
+        <skip.hudi-spark2.unit.tests>true</skip.hudi-spark2.unit.tests>
+        <skipITs>true</skipITs>
       </properties>
+      <activation>
+        <property>
+          <name>spark3.0.x</name>
+        </property>
+      </activation>
     </profile>
 
     <profile>

From 8c2ed8b8e5c987ccfd0dfa99e2d2b0c7f63e10ab Mon Sep 17 00:00:00 2001
From: Raymond Xu <2701446+xushiyan@users.noreply.github.com>
Date: Mon, 10 Jan 2022 16:07:43 -0800
Subject: [PATCH 2/2] fix spark 3 bundle name

---
 pom.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e87c00037165..da92455e7eca9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,12 +113,10 @@
     <prometheus.version>0.8.0</prometheus.version>
     <http.version>4.4.1</http.version>
     <spark.version>${spark2.version}</spark.version>
-    <sparkbundle.version>${spark2bundle.version}</sparkbundle.version>
+    <sparkbundle.version></sparkbundle.version>
     <flink.version>1.13.1</flink.version>
     <spark2.version>2.4.4</spark2.version>
     <spark3.version>3.1.2</spark3.version>
-    <spark2bundle.version></spark2bundle.version>
-    <spark3bundle.version>3</spark3bundle.version>
     <hudi.spark.module>hudi-spark2</hudi.spark.module>
     <avro.version>1.8.2</avro.version>
     <scala11.version>2.11.12</scala11.version>
@@ -1568,7 +1566,7 @@
       <id>spark3</id>
       <properties>
         <spark.version>${spark3.version}</spark.version>
-        <sparkbundle.version>${spark3bundle.version}</sparkbundle.version>
+        <sparkbundle.version>${spark3.version}</sparkbundle.version>
         <scala.version>${scala12.version}</scala.version>
         <scala.binary.version>2.12</scala.binary.version>
         <hudi.spark.module>hudi-spark3</hudi.spark.module>
@@ -1593,7 +1591,7 @@
       <properties>
         <spark3.version>3.0.3</spark3.version>
         <spark.version>${spark3.version}</spark.version>
-        <sparkbundle.version>${spark3bundle.version}</sparkbundle.version>
+        <sparkbundle.version>${spark3.version}</sparkbundle.version>
         <scala.version>${scala12.version}</scala.version>
         <scala.binary.version>2.12</scala.binary.version>
         <hudi.spark.module>hudi-spark3</hudi.spark.module>