From 080f9c45d42cd8caac7a3962d9e2af8ee0eb6a57 Mon Sep 17 00:00:00 2001
From: Calvin Kirs <guoqiang@selectdb.com>
Date: Mon, 2 Dec 2024 17:56:12 +0800
Subject: [PATCH 1/3] [Chore](dependencies)Upgrade Fe dependencies upgrade
 guava to 32.2.1-jre upgrade zookeeper to 3.9.3 upgrade azure to 1.2.29
 exclusion ini4j and lucene

---
 fe/fe-core/pom.xml | 19 +++++++++++++++++++
 fe/pom.xml         | 34 ++++++++++++++++++++++++++--------
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 70678c4262de33..1b40974d7e8b19 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -347,6 +347,7 @@ under the License.
             <groupId>com.alibaba.otter</groupId>
             <artifactId>canal.client</artifactId>
             <version>1.1.6</version>
+            <scope>provided</scope>
             <exclusions>
                 <exclusion>
                     <groupId>ch.qos.logback</groupId>
@@ -410,6 +411,7 @@ under the License.
             <groupId>com.huaweicloud</groupId>
             <artifactId>hadoop-huaweicloud</artifactId>
             <version>${huaweiobs.version}</version>
+            <scope>${obs.dependency.scope}</scope>
             <exclusions>
                 <exclusion>
                     <artifactId>jackson-databind</artifactId>
@@ -421,6 +423,7 @@ under the License.
             <groupId>com.qcloud.cos</groupId>
             <artifactId>hadoop-cos</artifactId>
             <version>${tencentcos.version}</version>
+            <scope>${cos.dependency.scope}</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.json</groupId>
@@ -758,6 +761,20 @@ under the License.
             <groupId>com.qcloud</groupId>
             <artifactId>cos_api</artifactId>
             <version>5.6.211</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.thoughtworks.xstream</groupId>
+                    <artifactId>xstream</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.qcloud</groupId>
@@ -768,6 +785,7 @@ under the License.
             <groupId>com.huaweicloud</groupId>
             <artifactId>esdk-obs-java-bundle</artifactId>
             <version>[3.21.11,)</version>
+            <scope>${obs.dependency.scope}</scope>
         </dependency>
         <dependency>
             <groupId>com.baidubce</groupId>
@@ -791,6 +809,7 @@ under the License.
             <artifactId>gcs-connector</artifactId>
             <version>hadoop3-2.2.21</version>
             <classifier>shaded</classifier>
+            <scope>${gcs.dependency.scope}</scope>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
diff --git a/fe/pom.xml b/fe/pom.xml
index d78cfd50b819b4..651a155ff59b68 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -222,13 +222,20 @@ under the License.
         <module>be-java-extensions</module>
     </modules>
     <properties>
+        <doris.hive.catalog.shade.version>2.1.1</doris.hive.catalog.shade.version>
+        <avro.version>1.11.4</avro.version>
+        <parquet.version>1.13.1</parquet.version>
+        <spark.version>3.4.3</spark.version>
+        <hudi.version>0.14.1</hudi.version>
+        <obs.dependency.scope>compile</obs.dependency.scope>
+        <cos.dependency.scope>compile</cos.dependency.scope>
+        <gcs.dependency.scope>compile</gcs.dependency.scope>
         <!--suppress UnresolvedMavenProperty -->
         <doris.thirdparty>${fe.dir}/../thirdparty</doris.thirdparty>
         <!--suppress UnresolvedMavenProperty -->
         <doris.home>${fe.dir}/../</doris.home>
         <revision>1.2-SNAPSHOT</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <doris.hive.catalog.shade.version>2.1.1</doris.hive.catalog.shade.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <!--plugin parameters-->
@@ -248,7 +255,7 @@ under the License.
         <commons-text.version>1.10.0</commons-text.version>
         <commons-validator.version>1.7</commons-validator.version>
         <gson.version>2.10.1</gson.version>
-        <guava.version>32.1.2-jre</guava.version>
+        <guava.version>33.2.1-jre</guava.version>
         <jackson.version>2.16.0</jackson.version>
         <java-cup.version>0.11-a-czt02-cdh</java-cup.version>
         <javassist.version>3.18.2-GA</javassist.version>
@@ -301,7 +308,6 @@ under the License.
         <javax.activation.version>1.2.0</javax.activation.version>
         <jaxws-api.version>2.3.0</jaxws-api.version>
         <RoaringBitmap.version>0.8.13</RoaringBitmap.version>
-        <spark.version>3.4.3</spark.version>
         <hudi-spark.version>hudi-spark3.4.x</hudi-spark.version>
         <hive.version>3.1.3</hive.version>
         <hive.common.version>2.3.9</hive.common.version>
@@ -314,16 +320,14 @@ under the License.
          you can find avro version info in iceberg mvn repository -->
         <iceberg.version>1.4.3</iceberg.version>
         <maxcompute.version>0.49.0-public</maxcompute.version>
-        <avro.version>1.11.4</avro.version>
         <arrow.version>17.0.0</arrow.version>
         <!-- hudi -->
-        <hudi.version>0.14.1</hudi.version>
         <presto.hadoop.version>2.7.4-11</presto.hadoop.version>
         <presto.hive.version>3.0.0-8</presto.hive.version>
         <!-- lakesoul -->
         <lakesoul.version>2.6.2</lakesoul.version>
 
-        <parquet.version>1.13.1</parquet.version>
+
         <commons-collections.version>3.2.2</commons-collections.version>
         <commons-compress.version>1.27.1</commons-compress.version>
         <scala.version>2.12.10</scala.version>
@@ -346,7 +350,7 @@ under the License.
         <spring.version>2.7.18</spring.version>
         <spring-framework.version>5.3.39</spring-framework.version>
         <orc.version>1.8.4</orc.version>
-        <zookeeper.version>3.9.2</zookeeper.version>
+        <zookeeper.version>3.9.3</zookeeper.version>
         <velocity-engine-core.version>2.4</velocity-engine-core.version>
         <ranger-plugins-common.version>2.4.0</ranger-plugins-common.version>
         <bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
@@ -372,7 +376,7 @@ under the License.
         <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
         <asm.version>9.4</asm.version>
         <airlift.version>202</airlift.version>
-        <azure.sdk.version>1.2.27</azure.sdk.version>
+        <azure.sdk.version>1.2.29</azure.sdk.version>
         <azure.sdk.batch.version>12.22.0</azure.sdk.batch.version>
         <semver4j.version>5.3.0</semver4j.version>
         <aliyun-sdk-oss.version>3.15.0</aliyun-sdk-oss.version>
@@ -1319,6 +1323,10 @@ under the License.
                         <groupId>org.apache.arrow</groupId>
                         <artifactId>arrow-vector</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.ini4j</groupId>
+                        <artifactId>ini4j</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <!-- For Iceberg, must be consistent with Iceberg version -->
@@ -1634,6 +1642,11 @@ under the License.
                         <artifactId>re2j</artifactId>
                         <groupId>io.trino</groupId>
                     </exclusion>
+                    <!-- trino-main brings in 9.7.0 (vs 8.11.1) -->
+                    <exclusion>
+                        <groupId>org.apache.lucene</groupId>
+                        <artifactId>lucene-analyzers-common</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -1651,6 +1664,11 @@ under the License.
                 <artifactId>concurrent</artifactId>
                 <version>${airlift.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15on</artifactId>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>com.azure</groupId>
                 <artifactId>azure-sdk-bom</artifactId>

From 9b64564f366a979d5bf77fd1d128ac6c00ef0ec8 Mon Sep 17 00:00:00 2001
From: Calvin Kirs <kirs@apache.org>
Date: Mon, 9 Dec 2024 11:55:58 +0800
Subject: [PATCH 2/3] Update pom.xml

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

diff --git a/fe/pom.xml b/fe/pom.xml
index 469844d191cabb..70c643c35b544d 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -374,7 +374,7 @@ under the License.
         <trino.version>435</trino.version>
         <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
         <asm.version>9.4</asm.version>
-        <airlift.version>202</airlift.version>
+        <airlift.concurrent.version>202</airlift.concurrent.version>
         <azure.sdk.version>1.2.29</azure.sdk.version>
         <azure.sdk.batch.version>12.22.0</azure.sdk.batch.version>
         <semver4j.version>5.3.0</semver4j.version>

From fec45d14f280370efd24edd38193635422f4bb68 Mon Sep 17 00:00:00 2001
From: Calvin Kirs <kirs@apache.org>
Date: Mon, 9 Dec 2024 14:05:54 +0800
Subject: [PATCH 3/3] Update pom.xml

---
 fe/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/fe/pom.xml b/fe/pom.xml
index 70c643c35b544d..c0f78b4423d0ba 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -1641,11 +1641,6 @@ under the License.
                         <artifactId>re2j</artifactId>
                         <groupId>io.trino</groupId>
                     </exclusion>
-                    <!-- trino-main brings in 9.7.0 (vs 8.11.1) -->
-                    <exclusion>
-                        <groupId>org.apache.lucene</groupId>
-                        <artifactId>lucene-analyzers-common</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>