From 014501463570105dd413f5142d6161674110448c Mon Sep 17 00:00:00 2001
From: mozhenghua <baisui@qlangtech.com>
Date: Wed, 26 Jul 2023 09:45:19 +0800
Subject: [PATCH] suport hadoop3

---
 packaging/hudi-flink-bundle/pom.xml |  4 ++--
 pom.xml                             | 17 ++++++++++++++++-
 tisInstall.sh                       |  4 ++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/packaging/hudi-flink-bundle/pom.xml b/packaging/hudi-flink-bundle/pom.xml
index e21f6f771942..901201f5f3a4 100644
--- a/packaging/hudi-flink-bundle/pom.xml
+++ b/packaging/hudi-flink-bundle/pom.xml
@@ -36,7 +36,7 @@
     <javax.servlet.version>3.1.0</javax.servlet.version>
     <!-- override to be same with flink 1.12.2 -->
     <parquet.version>1.11.1</parquet.version>
-    <hive.version>2.3.1</hive.version>
+<!--    <hive.version>2.3.1</hive.version>-->
     <thrift.version>0.9.3</thrift.version>
   </properties>
 
@@ -680,7 +680,7 @@
     <profile>
       <id>flink-bundle-shade-hive3</id>
       <properties>
-        <hive.version>3.1.2</hive.version>
+<!--        <hive.version>3.1.2</hive.version>-->
         <flink.bundle.hive.scope>compile</flink.bundle.hive.scope>
       </properties>
       <dependencies>
diff --git a/pom.xml b/pom.xml
index 66ef91f6f78b..c824242b4504 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
 
 <!--        <spark3.version>3.1.2</spark3.version>-->
         <!--for aliyum emr spark3 version 3.2.1 ,so change to -->
-        <spark3.version>3.2.1</spark3.version>
+        <spark3.version>3.3.1</spark3.version>
         <hudi.spark.module>hudi-spark2</hudi.spark.module>
         <avro.version>1.8.2</avro.version>
         <scala11.version>2.11.12</scala11.version>
@@ -1654,6 +1654,21 @@
                 </property>
             </activation>
         </profile>
+
+
+        <profile>
+            <id>hive2</id>
+            <properties>
+                <hive.version>2.3.1</hive.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>hive3</id>
+            <properties>
+                <hive.version>3.1.3</hive.version>
+            </properties>
+        </profile>
+
     </profiles>
 
 </project>
diff --git a/tisInstall.sh b/tisInstall.sh
index da17f011775f..3704ef7ed4f2 100644
--- a/tisInstall.sh
+++ b/tisInstall.sh
@@ -17,6 +17,6 @@ mvn clean deploy -P$MVN_PROFILE \
 -DaltDeploymentRepository=base::default::http://localhost:8080/release
 }
 
-compileAndDeploy "spark2,flink-bundle-shade-hive2"
+compileAndDeploy "spark2,flink-bundle-shade-hive2,hive2"
 
-compileAndDeploy "spark3,flink-bundle-shade-hive3"
+compileAndDeploy "spark3,flink-bundle-shade-hive3,hive3"