From e17779f19343bbc229fe3fb3d93d032605339091 Mon Sep 17 00:00:00 2001
From: Calvin Kirs <acm_master@163.com>
Date: Fri, 11 Aug 2023 10:54:37 +0800
Subject: [PATCH] [Dependency](fe)Upgrade dependency version (#22496)

Upgrade guava to 32.1.2-jre
Set ck dependency scope to provided
Upgrade okio to 3.4.0
Upgrade snake yaml to 1.33
Upgrade aws-java-sdk to 1.12.519
Upgrade hadoop to 3.3.6
---
 fe/fe-core/pom.xml                            |   2 +-
 .../metastore/AWSGlueDecoratorBase.java       | 126 ++++++++++++++++++
 fe/pom.xml                                    |  20 ++-
 3 files changed, 140 insertions(+), 8 deletions(-)

diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 8c283a6548..40afee2bcd 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -34,7 +34,7 @@ under the License.
         <fe_ut_parallel>1</fe_ut_parallel>
         <antlr4.version>4.9.3</antlr4.version>
         <awssdk.version>2.17.257</awssdk.version>
-        <huaweiobs.version>3.1.1-hw-45</huaweiobs.version>
+        <huaweiobs.version>3.1.1-hw-46</huaweiobs.version>
         <tencentcos.version>3.3.5</tencentcos.version>
     </properties>
     <profiles>
diff --git a/fe/fe-core/src/main/java/com/amazonaws/glue/catalog/metastore/AWSGlueDecoratorBase.java b/fe/fe-core/src/main/java/com/amazonaws/glue/catalog/metastore/AWSGlueDecoratorBase.java
index 595b21ab5d..027dec347a 100644
--- a/fe/fe-core/src/main/java/com/amazonaws/glue/catalog/metastore/AWSGlueDecoratorBase.java
+++ b/fe/fe-core/src/main/java/com/amazonaws/glue/catalog/metastore/AWSGlueDecoratorBase.java
@@ -40,6 +40,8 @@ import com.amazonaws.services.glue.model.BatchGetCrawlersRequest;
 import com.amazonaws.services.glue.model.BatchGetCrawlersResult;
 import com.amazonaws.services.glue.model.BatchGetCustomEntityTypesRequest;
 import com.amazonaws.services.glue.model.BatchGetCustomEntityTypesResult;
+import com.amazonaws.services.glue.model.BatchGetDataQualityResultRequest;
+import com.amazonaws.services.glue.model.BatchGetDataQualityResultResult;
 import com.amazonaws.services.glue.model.BatchGetDevEndpointsRequest;
 import com.amazonaws.services.glue.model.BatchGetDevEndpointsResult;
 import com.amazonaws.services.glue.model.BatchGetJobsRequest;
@@ -54,6 +56,10 @@ import com.amazonaws.services.glue.model.BatchStopJobRunRequest;
 import com.amazonaws.services.glue.model.BatchStopJobRunResult;
 import com.amazonaws.services.glue.model.BatchUpdatePartitionRequest;
 import com.amazonaws.services.glue.model.BatchUpdatePartitionResult;
+import com.amazonaws.services.glue.model.CancelDataQualityRuleRecommendationRunRequest;
+import com.amazonaws.services.glue.model.CancelDataQualityRuleRecommendationRunResult;
+import com.amazonaws.services.glue.model.CancelDataQualityRulesetEvaluationRunRequest;
+import com.amazonaws.services.glue.model.CancelDataQualityRulesetEvaluationRunResult;
 import com.amazonaws.services.glue.model.CancelMLTaskRunRequest;
 import com.amazonaws.services.glue.model.CancelMLTaskRunResult;
 import com.amazonaws.services.glue.model.CancelStatementRequest;
@@ -70,6 +76,8 @@ import com.amazonaws.services.glue.model.CreateCrawlerRequest;
 import com.amazonaws.services.glue.model.CreateCrawlerResult;
 import com.amazonaws.services.glue.model.CreateCustomEntityTypeRequest;
 import com.amazonaws.services.glue.model.CreateCustomEntityTypeResult;
+import com.amazonaws.services.glue.model.CreateDataQualityRulesetRequest;
+import com.amazonaws.services.glue.model.CreateDataQualityRulesetResult;
 import com.amazonaws.services.glue.model.CreateDatabaseRequest;
 import com.amazonaws.services.glue.model.CreateDatabaseResult;
 import com.amazonaws.services.glue.model.CreateDevEndpointRequest;
@@ -114,6 +122,8 @@ import com.amazonaws.services.glue.model.DeleteCrawlerRequest;
 import com.amazonaws.services.glue.model.DeleteCrawlerResult;
 import com.amazonaws.services.glue.model.DeleteCustomEntityTypeRequest;
 import com.amazonaws.services.glue.model.DeleteCustomEntityTypeResult;
+import com.amazonaws.services.glue.model.DeleteDataQualityRulesetRequest;
+import com.amazonaws.services.glue.model.DeleteDataQualityRulesetResult;
 import com.amazonaws.services.glue.model.DeleteDatabaseRequest;
 import com.amazonaws.services.glue.model.DeleteDatabaseResult;
 import com.amazonaws.services.glue.model.DeleteDevEndpointRequest;
@@ -178,6 +188,14 @@ import com.amazonaws.services.glue.model.GetCustomEntityTypeRequest;
 import com.amazonaws.services.glue.model.GetCustomEntityTypeResult;
 import com.amazonaws.services.glue.model.GetDataCatalogEncryptionSettingsRequest;
 import com.amazonaws.services.glue.model.GetDataCatalogEncryptionSettingsResult;
+import com.amazonaws.services.glue.model.GetDataQualityResultRequest;
+import com.amazonaws.services.glue.model.GetDataQualityResultResult;
+import com.amazonaws.services.glue.model.GetDataQualityRuleRecommendationRunRequest;
+import com.amazonaws.services.glue.model.GetDataQualityRuleRecommendationRunResult;
+import com.amazonaws.services.glue.model.GetDataQualityRulesetEvaluationRunRequest;
+import com.amazonaws.services.glue.model.GetDataQualityRulesetEvaluationRunResult;
+import com.amazonaws.services.glue.model.GetDataQualityRulesetRequest;
+import com.amazonaws.services.glue.model.GetDataQualityRulesetResult;
 import com.amazonaws.services.glue.model.GetDatabaseRequest;
 import com.amazonaws.services.glue.model.GetDatabaseResult;
 import com.amazonaws.services.glue.model.GetDatabasesRequest;
@@ -280,6 +298,14 @@ import com.amazonaws.services.glue.model.ListCrawlsRequest;
 import com.amazonaws.services.glue.model.ListCrawlsResult;
 import com.amazonaws.services.glue.model.ListCustomEntityTypesRequest;
 import com.amazonaws.services.glue.model.ListCustomEntityTypesResult;
+import com.amazonaws.services.glue.model.ListDataQualityResultsRequest;
+import com.amazonaws.services.glue.model.ListDataQualityResultsResult;
+import com.amazonaws.services.glue.model.ListDataQualityRuleRecommendationRunsRequest;
+import com.amazonaws.services.glue.model.ListDataQualityRuleRecommendationRunsResult;
+import com.amazonaws.services.glue.model.ListDataQualityRulesetEvaluationRunsRequest;
+import com.amazonaws.services.glue.model.ListDataQualityRulesetEvaluationRunsResult;
+import com.amazonaws.services.glue.model.ListDataQualityRulesetsRequest;
+import com.amazonaws.services.glue.model.ListDataQualityRulesetsResult;
 import com.amazonaws.services.glue.model.ListDevEndpointsRequest;
 import com.amazonaws.services.glue.model.ListDevEndpointsResult;
 import com.amazonaws.services.glue.model.ListJobsRequest;
@@ -328,6 +354,10 @@ import com.amazonaws.services.glue.model.StartCrawlerRequest;
 import com.amazonaws.services.glue.model.StartCrawlerResult;
 import com.amazonaws.services.glue.model.StartCrawlerScheduleRequest;
 import com.amazonaws.services.glue.model.StartCrawlerScheduleResult;
+import com.amazonaws.services.glue.model.StartDataQualityRuleRecommendationRunRequest;
+import com.amazonaws.services.glue.model.StartDataQualityRuleRecommendationRunResult;
+import com.amazonaws.services.glue.model.StartDataQualityRulesetEvaluationRunRequest;
+import com.amazonaws.services.glue.model.StartDataQualityRulesetEvaluationRunResult;
 import com.amazonaws.services.glue.model.StartExportLabelsTaskRunRequest;
 import com.amazonaws.services.glue.model.StartExportLabelsTaskRunResult;
 import com.amazonaws.services.glue.model.StartImportLabelsTaskRunRequest;
@@ -370,10 +400,14 @@ import com.amazonaws.services.glue.model.UpdateCrawlerRequest;
 import com.amazonaws.services.glue.model.UpdateCrawlerResult;
 import com.amazonaws.services.glue.model.UpdateCrawlerScheduleRequest;
 import com.amazonaws.services.glue.model.UpdateCrawlerScheduleResult;
+import com.amazonaws.services.glue.model.UpdateDataQualityRulesetRequest;
+import com.amazonaws.services.glue.model.UpdateDataQualityRulesetResult;
 import com.amazonaws.services.glue.model.UpdateDatabaseRequest;
 import com.amazonaws.services.glue.model.UpdateDatabaseResult;
 import com.amazonaws.services.glue.model.UpdateDevEndpointRequest;
 import com.amazonaws.services.glue.model.UpdateDevEndpointResult;
+import com.amazonaws.services.glue.model.UpdateJobFromSourceControlRequest;
+import com.amazonaws.services.glue.model.UpdateJobFromSourceControlResult;
 import com.amazonaws.services.glue.model.UpdateJobRequest;
 import com.amazonaws.services.glue.model.UpdateJobResult;
 import com.amazonaws.services.glue.model.UpdateMLTransformRequest;
@@ -384,6 +418,8 @@ import com.amazonaws.services.glue.model.UpdateRegistryRequest;
 import com.amazonaws.services.glue.model.UpdateRegistryResult;
 import com.amazonaws.services.glue.model.UpdateSchemaRequest;
 import com.amazonaws.services.glue.model.UpdateSchemaResult;
+import com.amazonaws.services.glue.model.UpdateSourceControlFromJobRequest;
+import com.amazonaws.services.glue.model.UpdateSourceControlFromJobResult;
 import com.amazonaws.services.glue.model.UpdateTableRequest;
 import com.amazonaws.services.glue.model.UpdateTableResult;
 import com.amazonaws.services.glue.model.UpdateTriggerRequest;
@@ -1339,5 +1375,95 @@ public class AWSGlueDecoratorBase implements AWSGlue {
     public BatchGetBlueprintsResult batchGetBlueprints(BatchGetBlueprintsRequest batchGetBlueprintsRequest) {
         return decoratedAwsGlue.batchGetBlueprints(batchGetBlueprintsRequest);
     }
+
+    @Override
+    public UpdateSourceControlFromJobResult updateSourceControlFromJob(UpdateSourceControlFromJobRequest updateSourceControlFromJobRequest) {
+        return null;
+    }
+
+    @Override
+    public BatchGetDataQualityResultResult batchGetDataQualityResult(BatchGetDataQualityResultRequest batchGetDataQualityResultRequest) {
+        return null;
+    }
+
+    @Override
+    public CancelDataQualityRuleRecommendationRunResult cancelDataQualityRuleRecommendationRun(CancelDataQualityRuleRecommendationRunRequest cancelDataQualityRuleRecommendationRunRequest) {
+        return null;
+    }
+
+    @Override
+    public CancelDataQualityRulesetEvaluationRunResult cancelDataQualityRulesetEvaluationRun(CancelDataQualityRulesetEvaluationRunRequest cancelDataQualityRulesetEvaluationRunRequest) {
+        return null;
+    }
+
+    @Override
+    public CreateDataQualityRulesetResult createDataQualityRuleset(CreateDataQualityRulesetRequest createDataQualityRulesetRequest) {
+        return null;
+    }
+
+    @Override
+    public DeleteDataQualityRulesetResult deleteDataQualityRuleset(DeleteDataQualityRulesetRequest deleteDataQualityRulesetRequest) {
+        return null;
+    }
+
+    @Override
+    public GetDataQualityResultResult getDataQualityResult(GetDataQualityResultRequest getDataQualityResultRequest) {
+        return null;
+    }
+
+    @Override
+    public GetDataQualityRuleRecommendationRunResult getDataQualityRuleRecommendationRun(GetDataQualityRuleRecommendationRunRequest getDataQualityRuleRecommendationRunRequest) {
+        return null;
+    }
+
+    @Override
+    public GetDataQualityRulesetResult getDataQualityRuleset(GetDataQualityRulesetRequest getDataQualityRulesetRequest) {
+        return null;
+    }
+
+    @Override
+    public GetDataQualityRulesetEvaluationRunResult getDataQualityRulesetEvaluationRun(GetDataQualityRulesetEvaluationRunRequest getDataQualityRulesetEvaluationRunRequest) {
+        return null;
+    }
+
+    @Override
+    public ListDataQualityResultsResult listDataQualityResults(ListDataQualityResultsRequest listDataQualityResultsRequest) {
+        return null;
+    }
+
+    @Override
+    public ListDataQualityRuleRecommendationRunsResult listDataQualityRuleRecommendationRuns(ListDataQualityRuleRecommendationRunsRequest listDataQualityRuleRecommendationRunsRequest) {
+        return null;
+    }
+
+    @Override
+    public ListDataQualityRulesetEvaluationRunsResult listDataQualityRulesetEvaluationRuns(ListDataQualityRulesetEvaluationRunsRequest listDataQualityRulesetEvaluationRunsRequest) {
+        return null;
+    }
+
+    @Override
+    public ListDataQualityRulesetsResult listDataQualityRulesets(ListDataQualityRulesetsRequest listDataQualityRulesetsRequest) {
+        return null;
+    }
+
+    @Override
+    public StartDataQualityRuleRecommendationRunResult startDataQualityRuleRecommendationRun(StartDataQualityRuleRecommendationRunRequest startDataQualityRuleRecommendationRunRequest) {
+        return null;
+    }
+
+    @Override
+    public StartDataQualityRulesetEvaluationRunResult startDataQualityRulesetEvaluationRun(StartDataQualityRulesetEvaluationRunRequest startDataQualityRulesetEvaluationRunRequest) {
+        return null;
+    }
+
+    @Override
+    public UpdateDataQualityRulesetResult updateDataQualityRuleset(UpdateDataQualityRulesetRequest updateDataQualityRulesetRequest) {
+        return null;
+    }
+
+    @Override
+    public UpdateJobFromSourceControlResult updateJobFromSourceControl(UpdateJobFromSourceControlRequest updateJobFromSourceControlRequest) {
+        return null;
+    }
 }
 
diff --git a/fe/pom.xml b/fe/pom.xml
index 627d95e339..b1055b2963 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -214,7 +214,7 @@ under the License.
         <commons-text.version>1.10.0</commons-text.version>
         <commons-validator.version>1.7</commons-validator.version>
         <gson.version>2.8.9</gson.version>
-        <guava.version>30.0-jre</guava.version>
+        <guava.version>32.1.2-jre</guava.version>
         <jackson.version>2.15.2</jackson.version>
         <java-cup.version>0.11-a-czt02-cdh</java-cup.version>
         <javassist.version>3.18.2-GA</javassist.version>
@@ -226,7 +226,7 @@ under the License.
         <json-simple.version>1.1.1</json-simple.version>
         <junit.version>5.8.2</junit.version>
         <druid.version>1.2.5</druid.version>
-        <clickhouse.version>0.4.2</clickhouse.version>
+        <clickhouse.version>0.4.6</clickhouse.version>
         <thrift.version>0.16.0</thrift.version>
         <tomcat-embed-core.version>8.5.86</tomcat-embed-core.version>
         <log4j2.version>2.18.0</log4j2.version>
@@ -252,8 +252,8 @@ under the License.
         <fabric8.kubernetes.version>6.7.2</fabric8.kubernetes.version>
         <logging-interceptor.version>4.7.2</logging-interceptor.version>
         <okhttp.version>4.9.3</okhttp.version>
-        <okio.version>2.6.0</okio.version>
-        <snakeyaml.version>1.15</snakeyaml.version>
+        <okio.version>3.4.0</okio.version>
+        <snakeyaml.version>1.33</snakeyaml.version>
         <validation-api.version>1.1.0.Final</validation-api.version>
         <zjsonpatch.version>0.2.3</zjsonpatch.version>
         <kafka-clients.version>3.4.0</kafka-clients.version>
@@ -281,7 +281,7 @@ under the License.
         <presto.hadoop.version>2.7.4-11</presto.hadoop.version>
         <presto.hive.version>3.0.0-8</presto.hive.version>
 
-        <parquet.version>1.13.0</parquet.version>
+        <parquet.version>1.13.1</parquet.version>
         <commons-collections.version>3.2.2</commons-collections.version>
         <commons-compress.version>1.22</commons-compress.version>
         <scala.version>2.12.10</scala.version>
@@ -291,10 +291,10 @@ under the License.
         <hamcrest.version>2.1</hamcrest.version>
         <httpclient.version>4.5.13</httpclient.version>
         <httpcore.version>4.4.15</httpcore.version>
-        <aws-java-sdk.version>1.12.302</aws-java-sdk.version>
+        <aws-java-sdk.version>1.12.519</aws-java-sdk.version>
         <mariadb-java-client.version>3.0.4</mariadb-java-client.version>
         <dlf-metastore-client-hive.version>0.2.14</dlf-metastore-client-hive.version>
-        <hadoop.version>3.3.5</hadoop.version>
+        <hadoop.version>3.3.6</hadoop.version>
         <joda.version>2.8.1</joda.version>
         <project.scm.id>github</project.scm.id>
         <spring.version>2.7.13</spring.version>
@@ -353,6 +353,11 @@ under the License.
     </profiles>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.amazonaws</groupId>
+                <artifactId>aws-java-sdk-bundle</artifactId>
+                <version>${aws-java-sdk.version}</version>
+            </dependency>
             <!-- opentelemetry-->
             <dependency>
                 <groupId>io.opentelemetry</groupId>
@@ -1400,6 +1405,7 @@ under the License.
                 <groupId>com.clickhouse</groupId>
                 <artifactId>clickhouse-jdbc</artifactId>
                 <version>${clickhouse.version}</version>
+                <scope>provided</scope>
                 <classifier>all</classifier>
             </dependency>
             <!-- https://mvnrepository.com/artifact/joda-time/joda-time -->