You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2023/04/19 05:59:08 UTC
[doris] branch branch-1.2-lts updated: [branch1.2] 1.2-ITS dependency upgrade (#18408)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new 1554f94cf0 [branch1.2] 1.2-ITS dependency upgrade (#18408)
1554f94cf0 is described below
commit 1554f94cf078d468d0a743d45562803894c5113c
Author: Calvin Kirs <ki...@apache.org>
AuthorDate: Wed Apr 19 13:58:58 2023 +0800
[branch1.2] 1.2-ITS dependency upgrade (#18408)
### FE
#### Upgrade
* Upgrade and bind netty version to 4.1.89.Final
* Upgrade hibernate-validator to 8.0.0.Final
* Upgrade and bind aws-java-sdk version to 1.12.302
* Upgrade and bind jackson version to 2.14.2
* Upgrade and bind guava version to 30.0-jre
* Upgrade and bind commons-filerupload version to 1.5
* Upgrade and bind Gson version to 2.8.9
* Upgrade and bind commons-io version to 2.7
* bind tomcat-embed-core version to 8.5.86
* Upgrade and bind check-framework version to 3.22.0
* Upgrade and bind protobuf version to 3.21.12
* Upgrade and bind ok-http version to 4.9.3
* Upgrade and bind websocket version to 9.4.49.v20220914
* Upgrade and bind snake-yaml version to 2.0
* Upgrade and bind kafka-client version to 3.4.0
* Upgrade and bind xnio-nio version to 3.8.8.Final
* Upgrade and bind calcite version to 1.33.0
* Upgrade and bind avro version to 1.11.1
* Upgrade and bind commons-compress version to 1.22
* Upgrade hadoop version to 3.3.4
* Upgrade and bind spring version to 2.7.9
* Upgrade zookeeper version to 3.4.14
* Upgrade and bind ojdbc6 version to ojdbc8 12.2.0.1
#### Dependency reduction
Remove unless dependency
* spring-loaded
#### replace Shade dependency
* Replace libthrift dependency with shade-libthrift 1.0.1-SNAPSHOT @morningman
* Replace spring-web dependency with spring-shade-5 1.0.1-SNAPSHOT
* Replace hive dependency with hive-shade-3 1.0.1-SNAPSHOT
* Replace hive dependency with hadoop-shade-2 1.0.1-SNAPSHOT
* Replace hudi-mr dependency with hudi-mr-shade-0.13 1.0.1-SNAPSHOT
#### Ipmrovement
* manage dependency slf4j and junit version in parent pom
* remove fasterxml.jackson and use jackson
### Broker(Hdfs)
#### Upgrade
* Upgrade and bind netty version to 4.1.89.Final
* Upgrade and bind guava version to 30.0-jre
* Upgrade and bind commons-io version to 2.11.0
* Upgrade and bind commons-collections4 version to 4.4
#### replace Shade dependency
* Replace libthrift dependency with shade-libthrift 1.0.1-SNAPSHOT
---
fe/fe-common/pom.xml | 9 +-
fe/fe-core/pom.xml | 223 +++++-----
.../catalog/metastore/AWSGlueDecoratorBase.java | 193 ++++++++-
.../doris/httpv2/controller/SystemController.java | 10 +-
.../org/apache/doris/service/FrontendOptions.java | 2 +-
.../org/apache/doris/system/SystemInfoService.java | 2 +-
fe/hive-udf/pom.xml | 27 +-
fe/java-udf/pom.xml | 23 +-
fe/pom.xml | 481 ++++++++++++++-------
fe/spark-dpp/pom.xml | 8 -
fs_brokers/apache_hdfs_broker/pom.xml | 204 +++++----
11 files changed, 764 insertions(+), 418 deletions(-)
diff --git a/fe/fe-common/pom.xml b/fe/fe-common/pom.xml
index 8f480f441f..a6ab6e64bb 100644
--- a/fe/fe-common/pom.xml
+++ b/fe/fe-common/pom.xml
@@ -49,7 +49,6 @@ under the License.
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
@@ -58,8 +57,8 @@ under the License.
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.thrift/libthrift -->
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>thrift-shade-0.13</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -69,10 +68,6 @@ under the License.
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
<!-- https://mvnrepository.com/artifact/org.jmockit/jmockit -->
<dependency>
<groupId>org.jmockit</groupId>
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 92a84f764e..ddf41c8824 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -33,6 +33,7 @@ under the License.
<fe_ut_parallel>1</fe_ut_parallel>
<doris.thirdparty>${basedir}/../../thirdparty</doris.thirdparty>
<antlr4.version>4.9.3</antlr4.version>
+ <awssdk.version>2.17.257</awssdk.version>
<protoc.artifact>com.google.protobuf:protoc:${protobuf.version}</protoc.artifact>
<grpc.java.artifact>io.grpc:protoc-gen-grpc-java:${grpc.version}</grpc.java.artifact>
</properties>
@@ -105,11 +106,6 @@ under the License.
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>springloaded</artifactId>
- <version>1.2.6.RELEASE</version>
- </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-ldap</artifactId>
@@ -174,11 +170,6 @@ under the License.
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-mapper-asl -->
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </dependency>
<!-- https://mvnrepository.com/artifact/net.sourceforge.czt.dev/java-cup -->
<dependency>
<groupId>net.sourceforge.czt.dev</groupId>
@@ -194,7 +185,6 @@ under the License.
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.doris</groupId>
@@ -204,13 +194,6 @@ under the License.
<dependency>
<groupId>de.jflex</groupId>
<artifactId>jflex</artifactId>
- <scope>provided</scope>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.jmockit/jmockit -->
- <dependency>
- <groupId>org.jmockit</groupId>
- <artifactId>jmockit</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -226,53 +209,42 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
+ <!-- https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-core -->
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.junit.vintage/junit-vintage-engine -->
<dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j2.version}</version>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec</artifactId>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12 -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>2.0.0</version>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-memcache</artifactId>
</dependency>
- <!-- https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-core -->
<dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-mqtt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
</dependency>
- <!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
+ <artifactId>netty-codec-http</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/org.objenesis/objenesis -->
<dependency>
@@ -404,6 +376,11 @@ under the License.
<groupId>org.roaringbitmap</groupId>
<artifactId>RoaringBitmap</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.github.ben-manes.caffeine</groupId>
+ <artifactId>caffeine</artifactId>
+ <version>2.9.3</version>
+ </dependency>
<!-- spark -->
<!-- https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.12 -->
<dependency>
@@ -414,6 +391,10 @@ under the License.
<artifactId>netty-all</artifactId>
<groupId>io.netty</groupId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro-mapred</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.spark/spark-launcher_2.12 -->
@@ -470,7 +451,6 @@ under the License.
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>5.1.0.Final</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -488,6 +468,7 @@ under the License.
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-dynamodb</artifactId>
</dependency>
+
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -513,8 +494,16 @@ under the License.
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>spring-shade-5</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId>
@@ -523,7 +512,6 @@ under the License.
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.3.3</version>
</dependency>
<!--Spring boot-->
<dependency>
@@ -554,8 +542,16 @@ under the License.
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>hive-shade-3</artifactId>
+ </dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
@@ -569,7 +565,7 @@ under the License.
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
- <version>2.15.45</version>
+ <version>${awssdk.version}</version>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
@@ -597,57 +593,18 @@ under the License.
<artifactId>grpc-stub</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <artifactId>netty-all</artifactId>
- <groupId>io.netty</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-client</artifactId>
+ <version>3.3.4</version>
</dependency>
<dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- <classifier>core</classifier>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>commons-httpclient</artifactId>
- <groupId>commons-httpclient</groupId>
- </exclusion>
- <exclusion>
- <artifactId>calcite-core</artifactId>
- <groupId>org.apache.calcite</groupId>
- </exclusion>
- <exclusion>
- <artifactId>calcite-druid</artifactId>
- <groupId>org.apache.calcite</groupId>
- </exclusion>
- <exclusion>
- <artifactId>calcite-linq4j</artifactId>
- <groupId>org.apache.calcite</groupId>
- </exclusion>
- <exclusion>
- <artifactId>avatica</artifactId>
- <groupId>org.apache.calcite.avatica</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.13</version>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.13</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -658,28 +615,35 @@ under the License.
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>netty-all</artifactId>
<groupId>io.netty</groupId>
</exclusion>
- <exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ <exclusion>
<artifactId>jackson-databind</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.14.1</version>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
<version>${hadoop.version}</version>
- <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.kerby</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>kerby-shade-1.0</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/io.opentelemetry/opentelemetry-api -->
<dependency>
@@ -711,20 +675,48 @@ under the License.
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-core</artifactId>
- <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.iceberg</groupId>
+ <artifactId>iceberg-aws</artifactId>
+ <version>${iceberg.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>glue</artifactId>
+ <version>${awssdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>sts</artifactId>
+ <version>${awssdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>url-connection-client</artifactId>
+ <version>${awssdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>aws-json-protocol</artifactId>
+ <version>${awssdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>protocol-core</artifactId>
+ <version>${awssdk.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-hive-metastore</artifactId>
- <scope>provided</scope>
</dependency>
<!-- For Iceberg, must be consistent with Iceberg version -->
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.hudi/hudi-common -->
@@ -745,14 +737,14 @@ under the License.
<!-- https://mvnrepository.com/artifact/org.apache.hudi/hudi-hadoop-mr -->
<dependency>
- <groupId>org.apache.hudi</groupId>
- <artifactId>hudi-hadoop-mr</artifactId>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>hudi-mr-shade-0.13</artifactId>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-avro</artifactId>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
</dependency>
@@ -1057,6 +1049,7 @@ under the License.
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
+ <includeScope>runtime</includeScope>
<skip>${skip.plugin}</skip>
</configuration>
</execution>
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 e707516188..963f7447b1 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
@@ -23,7 +23,6 @@ package com.amazonaws.glue.catalog.metastore;
import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.ResponseMetadata;
-import com.amazonaws.regions.Region;
import com.amazonaws.services.glue.AWSGlue;
import com.amazonaws.services.glue.model.BatchCreatePartitionRequest;
import com.amazonaws.services.glue.model.BatchCreatePartitionResult;
@@ -35,8 +34,12 @@ import com.amazonaws.services.glue.model.BatchDeleteTableRequest;
import com.amazonaws.services.glue.model.BatchDeleteTableResult;
import com.amazonaws.services.glue.model.BatchDeleteTableVersionRequest;
import com.amazonaws.services.glue.model.BatchDeleteTableVersionResult;
+import com.amazonaws.services.glue.model.BatchGetBlueprintsRequest;
+import com.amazonaws.services.glue.model.BatchGetBlueprintsResult;
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.BatchGetDevEndpointsRequest;
import com.amazonaws.services.glue.model.BatchGetDevEndpointsResult;
import com.amazonaws.services.glue.model.BatchGetJobsRequest;
@@ -53,14 +56,20 @@ import com.amazonaws.services.glue.model.BatchUpdatePartitionRequest;
import com.amazonaws.services.glue.model.BatchUpdatePartitionResult;
import com.amazonaws.services.glue.model.CancelMLTaskRunRequest;
import com.amazonaws.services.glue.model.CancelMLTaskRunResult;
+import com.amazonaws.services.glue.model.CancelStatementRequest;
+import com.amazonaws.services.glue.model.CancelStatementResult;
import com.amazonaws.services.glue.model.CheckSchemaVersionValidityRequest;
import com.amazonaws.services.glue.model.CheckSchemaVersionValidityResult;
+import com.amazonaws.services.glue.model.CreateBlueprintRequest;
+import com.amazonaws.services.glue.model.CreateBlueprintResult;
import com.amazonaws.services.glue.model.CreateClassifierRequest;
import com.amazonaws.services.glue.model.CreateClassifierResult;
import com.amazonaws.services.glue.model.CreateConnectionRequest;
import com.amazonaws.services.glue.model.CreateConnectionResult;
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.CreateDatabaseRequest;
import com.amazonaws.services.glue.model.CreateDatabaseResult;
import com.amazonaws.services.glue.model.CreateDevEndpointRequest;
@@ -81,6 +90,8 @@ import com.amazonaws.services.glue.model.CreateScriptRequest;
import com.amazonaws.services.glue.model.CreateScriptResult;
import com.amazonaws.services.glue.model.CreateSecurityConfigurationRequest;
import com.amazonaws.services.glue.model.CreateSecurityConfigurationResult;
+import com.amazonaws.services.glue.model.CreateSessionRequest;
+import com.amazonaws.services.glue.model.CreateSessionResult;
import com.amazonaws.services.glue.model.CreateTableRequest;
import com.amazonaws.services.glue.model.CreateTableResult;
import com.amazonaws.services.glue.model.CreateTriggerRequest;
@@ -89,6 +100,8 @@ import com.amazonaws.services.glue.model.CreateUserDefinedFunctionRequest;
import com.amazonaws.services.glue.model.CreateUserDefinedFunctionResult;
import com.amazonaws.services.glue.model.CreateWorkflowRequest;
import com.amazonaws.services.glue.model.CreateWorkflowResult;
+import com.amazonaws.services.glue.model.DeleteBlueprintRequest;
+import com.amazonaws.services.glue.model.DeleteBlueprintResult;
import com.amazonaws.services.glue.model.DeleteClassifierRequest;
import com.amazonaws.services.glue.model.DeleteClassifierResult;
import com.amazonaws.services.glue.model.DeleteColumnStatisticsForPartitionRequest;
@@ -99,6 +112,8 @@ import com.amazonaws.services.glue.model.DeleteConnectionRequest;
import com.amazonaws.services.glue.model.DeleteConnectionResult;
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.DeleteDatabaseRequest;
import com.amazonaws.services.glue.model.DeleteDatabaseResult;
import com.amazonaws.services.glue.model.DeleteDevEndpointRequest;
@@ -121,6 +136,8 @@ import com.amazonaws.services.glue.model.DeleteSchemaVersionsRequest;
import com.amazonaws.services.glue.model.DeleteSchemaVersionsResult;
import com.amazonaws.services.glue.model.DeleteSecurityConfigurationRequest;
import com.amazonaws.services.glue.model.DeleteSecurityConfigurationResult;
+import com.amazonaws.services.glue.model.DeleteSessionRequest;
+import com.amazonaws.services.glue.model.DeleteSessionResult;
import com.amazonaws.services.glue.model.DeleteTableRequest;
import com.amazonaws.services.glue.model.DeleteTableResult;
import com.amazonaws.services.glue.model.DeleteTableVersionRequest;
@@ -131,6 +148,12 @@ import com.amazonaws.services.glue.model.DeleteUserDefinedFunctionRequest;
import com.amazonaws.services.glue.model.DeleteUserDefinedFunctionResult;
import com.amazonaws.services.glue.model.DeleteWorkflowRequest;
import com.amazonaws.services.glue.model.DeleteWorkflowResult;
+import com.amazonaws.services.glue.model.GetBlueprintRequest;
+import com.amazonaws.services.glue.model.GetBlueprintResult;
+import com.amazonaws.services.glue.model.GetBlueprintRunRequest;
+import com.amazonaws.services.glue.model.GetBlueprintRunResult;
+import com.amazonaws.services.glue.model.GetBlueprintRunsRequest;
+import com.amazonaws.services.glue.model.GetBlueprintRunsResult;
import com.amazonaws.services.glue.model.GetCatalogImportStatusRequest;
import com.amazonaws.services.glue.model.GetCatalogImportStatusResult;
import com.amazonaws.services.glue.model.GetClassifierRequest;
@@ -151,6 +174,8 @@ import com.amazonaws.services.glue.model.GetCrawlerRequest;
import com.amazonaws.services.glue.model.GetCrawlerResult;
import com.amazonaws.services.glue.model.GetCrawlersRequest;
import com.amazonaws.services.glue.model.GetCrawlersResult;
+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.GetDatabaseRequest;
@@ -209,6 +234,10 @@ import com.amazonaws.services.glue.model.GetSecurityConfigurationRequest;
import com.amazonaws.services.glue.model.GetSecurityConfigurationResult;
import com.amazonaws.services.glue.model.GetSecurityConfigurationsRequest;
import com.amazonaws.services.glue.model.GetSecurityConfigurationsResult;
+import com.amazonaws.services.glue.model.GetSessionRequest;
+import com.amazonaws.services.glue.model.GetSessionResult;
+import com.amazonaws.services.glue.model.GetStatementRequest;
+import com.amazonaws.services.glue.model.GetStatementResult;
import com.amazonaws.services.glue.model.GetTableRequest;
import com.amazonaws.services.glue.model.GetTableResult;
import com.amazonaws.services.glue.model.GetTableVersionRequest;
@@ -223,6 +252,12 @@ import com.amazonaws.services.glue.model.GetTriggerRequest;
import com.amazonaws.services.glue.model.GetTriggerResult;
import com.amazonaws.services.glue.model.GetTriggersRequest;
import com.amazonaws.services.glue.model.GetTriggersResult;
+import com.amazonaws.services.glue.model.GetUnfilteredPartitionMetadataRequest;
+import com.amazonaws.services.glue.model.GetUnfilteredPartitionMetadataResult;
+import com.amazonaws.services.glue.model.GetUnfilteredPartitionsMetadataRequest;
+import com.amazonaws.services.glue.model.GetUnfilteredPartitionsMetadataResult;
+import com.amazonaws.services.glue.model.GetUnfilteredTableMetadataRequest;
+import com.amazonaws.services.glue.model.GetUnfilteredTableMetadataResult;
import com.amazonaws.services.glue.model.GetUserDefinedFunctionRequest;
import com.amazonaws.services.glue.model.GetUserDefinedFunctionResult;
import com.amazonaws.services.glue.model.GetUserDefinedFunctionsRequest;
@@ -237,8 +272,14 @@ import com.amazonaws.services.glue.model.GetWorkflowRunsRequest;
import com.amazonaws.services.glue.model.GetWorkflowRunsResult;
import com.amazonaws.services.glue.model.ImportCatalogToGlueRequest;
import com.amazonaws.services.glue.model.ImportCatalogToGlueResult;
+import com.amazonaws.services.glue.model.ListBlueprintsRequest;
+import com.amazonaws.services.glue.model.ListBlueprintsResult;
import com.amazonaws.services.glue.model.ListCrawlersRequest;
import com.amazonaws.services.glue.model.ListCrawlersResult;
+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.ListDevEndpointsRequest;
import com.amazonaws.services.glue.model.ListDevEndpointsResult;
import com.amazonaws.services.glue.model.ListJobsRequest;
@@ -251,6 +292,10 @@ import com.amazonaws.services.glue.model.ListSchemaVersionsRequest;
import com.amazonaws.services.glue.model.ListSchemaVersionsResult;
import com.amazonaws.services.glue.model.ListSchemasRequest;
import com.amazonaws.services.glue.model.ListSchemasResult;
+import com.amazonaws.services.glue.model.ListSessionsRequest;
+import com.amazonaws.services.glue.model.ListSessionsResult;
+import com.amazonaws.services.glue.model.ListStatementsRequest;
+import com.amazonaws.services.glue.model.ListStatementsResult;
import com.amazonaws.services.glue.model.ListTriggersRequest;
import com.amazonaws.services.glue.model.ListTriggersResult;
import com.amazonaws.services.glue.model.ListWorkflowsRequest;
@@ -273,8 +318,12 @@ import com.amazonaws.services.glue.model.ResetJobBookmarkRequest;
import com.amazonaws.services.glue.model.ResetJobBookmarkResult;
import com.amazonaws.services.glue.model.ResumeWorkflowRunRequest;
import com.amazonaws.services.glue.model.ResumeWorkflowRunResult;
+import com.amazonaws.services.glue.model.RunStatementRequest;
+import com.amazonaws.services.glue.model.RunStatementResult;
import com.amazonaws.services.glue.model.SearchTablesRequest;
import com.amazonaws.services.glue.model.SearchTablesResult;
+import com.amazonaws.services.glue.model.StartBlueprintRunRequest;
+import com.amazonaws.services.glue.model.StartBlueprintRunResult;
import com.amazonaws.services.glue.model.StartCrawlerRequest;
import com.amazonaws.services.glue.model.StartCrawlerResult;
import com.amazonaws.services.glue.model.StartCrawlerScheduleRequest;
@@ -297,6 +346,8 @@ import com.amazonaws.services.glue.model.StopCrawlerRequest;
import com.amazonaws.services.glue.model.StopCrawlerResult;
import com.amazonaws.services.glue.model.StopCrawlerScheduleRequest;
import com.amazonaws.services.glue.model.StopCrawlerScheduleResult;
+import com.amazonaws.services.glue.model.StopSessionRequest;
+import com.amazonaws.services.glue.model.StopSessionResult;
import com.amazonaws.services.glue.model.StopTriggerRequest;
import com.amazonaws.services.glue.model.StopTriggerResult;
import com.amazonaws.services.glue.model.StopWorkflowRunRequest;
@@ -305,6 +356,8 @@ import com.amazonaws.services.glue.model.TagResourceRequest;
import com.amazonaws.services.glue.model.TagResourceResult;
import com.amazonaws.services.glue.model.UntagResourceRequest;
import com.amazonaws.services.glue.model.UntagResourceResult;
+import com.amazonaws.services.glue.model.UpdateBlueprintRequest;
+import com.amazonaws.services.glue.model.UpdateBlueprintResult;
import com.amazonaws.services.glue.model.UpdateClassifierRequest;
import com.amazonaws.services.glue.model.UpdateClassifierResult;
import com.amazonaws.services.glue.model.UpdateColumnStatisticsForPartitionRequest;
@@ -347,6 +400,9 @@ import com.amazonaws.services.glue.model.UpdateWorkflowResult;
* All @Override methods are generated by IntelliJ IDEA.
*/
public class AWSGlueDecoratorBase implements AWSGlue {
+
+
+
private AWSGlue decoratedAwsGlue;
public AWSGlueDecoratorBase(AWSGlue awsGlueToBeDecorated) {
@@ -383,6 +439,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.batchGetCrawlers(batchGetCrawlersRequest);
}
+ @Override
+ public BatchGetCustomEntityTypesResult batchGetCustomEntityTypes(BatchGetCustomEntityTypesRequest batchGetCustomEntityTypesRequest) {
+ return decoratedAwsGlue.batchGetCustomEntityTypes(batchGetCustomEntityTypesRequest);
+ }
+
@Override
public BatchGetDevEndpointsResult batchGetDevEndpoints(BatchGetDevEndpointsRequest batchGetDevEndpointsRequest) {
return decoratedAwsGlue.batchGetDevEndpoints(batchGetDevEndpointsRequest);
@@ -423,11 +484,21 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.cancelMLTaskRun(cancelMLTaskRunRequest);
}
+ @Override
+ public CancelStatementResult cancelStatement(CancelStatementRequest cancelStatementRequest) {
+ return decoratedAwsGlue.cancelStatement(cancelStatementRequest);
+ }
+
@Override
public CheckSchemaVersionValidityResult checkSchemaVersionValidity(CheckSchemaVersionValidityRequest checkSchemaVersionValidityRequest) {
return null;
}
+ @Override
+ public CreateBlueprintResult createBlueprint(CreateBlueprintRequest createBlueprintRequest) {
+ return null;
+ }
+
@Override
public CreateClassifierResult createClassifier(CreateClassifierRequest createClassifierRequest) {
return decoratedAwsGlue.createClassifier(createClassifierRequest);
@@ -443,6 +514,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.createCrawler(createCrawlerRequest);
}
+ @Override
+ public CreateCustomEntityTypeResult createCustomEntityType(CreateCustomEntityTypeRequest createCustomEntityTypeRequest) {
+ return decoratedAwsGlue.createCustomEntityType(createCustomEntityTypeRequest);
+ }
+
@Override
public CreateDatabaseResult createDatabase(CreateDatabaseRequest createDatabaseRequest) {
return decoratedAwsGlue.createDatabase(createDatabaseRequest);
@@ -493,6 +569,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.createSecurityConfiguration(createSecurityConfigurationRequest);
}
+ @Override
+ public CreateSessionResult createSession(CreateSessionRequest createSessionRequest) {
+ return decoratedAwsGlue.createSession(createSessionRequest);
+ }
+
@Override
public CreateTableResult createTable(CreateTableRequest createTableRequest) {
return decoratedAwsGlue.createTable(createTableRequest);
@@ -513,6 +594,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.createWorkflow(createWorkflowRequest);
}
+ @Override
+ public DeleteBlueprintResult deleteBlueprint(DeleteBlueprintRequest deleteBlueprintRequest) {
+ return decoratedAwsGlue.deleteBlueprint(deleteBlueprintRequest);
+ }
+
@Override
public DeleteClassifierResult deleteClassifier(DeleteClassifierRequest deleteClassifierRequest) {
return decoratedAwsGlue.deleteClassifier(deleteClassifierRequest);
@@ -528,6 +614,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.deleteCrawler(deleteCrawlerRequest);
}
+ @Override
+ public DeleteCustomEntityTypeResult deleteCustomEntityType(DeleteCustomEntityTypeRequest deleteCustomEntityTypeRequest) {
+ return decoratedAwsGlue.deleteCustomEntityType(deleteCustomEntityTypeRequest);
+ }
+
@Override
public DeleteDatabaseResult deleteDatabase(DeleteDatabaseRequest deleteDatabaseRequest) {
return decoratedAwsGlue.deleteDatabase(deleteDatabaseRequest);
@@ -583,6 +674,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.deleteSecurityConfiguration(deleteSecurityConfigurationRequest);
}
+ @Override
+ public DeleteSessionResult deleteSession(DeleteSessionRequest deleteSessionRequest) {
+ return decoratedAwsGlue.deleteSession(deleteSessionRequest);
+ }
+
@Override
public DeleteTableResult deleteTable(DeleteTableRequest deleteTableRequest) {
return decoratedAwsGlue.deleteTable(deleteTableRequest);
@@ -608,6 +704,21 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.deleteWorkflow(deleteWorkflowRequest);
}
+ @Override
+ public GetBlueprintResult getBlueprint(GetBlueprintRequest getBlueprintRequest) {
+ return decoratedAwsGlue.getBlueprint(getBlueprintRequest);
+ }
+
+ @Override
+ public GetBlueprintRunResult getBlueprintRun(GetBlueprintRunRequest getBlueprintRunRequest) {
+ return decoratedAwsGlue.getBlueprintRun(getBlueprintRunRequest);
+ }
+
+ @Override
+ public GetBlueprintRunsResult getBlueprintRuns(GetBlueprintRunsRequest getBlueprintRunsRequest) {
+ return decoratedAwsGlue.getBlueprintRuns(getBlueprintRunsRequest);
+ }
+
@Override
public GetCatalogImportStatusResult getCatalogImportStatus(GetCatalogImportStatusRequest getCatalogImportStatusRequest) {
return decoratedAwsGlue.getCatalogImportStatus(getCatalogImportStatusRequest);
@@ -648,6 +759,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.getCrawlers(getCrawlersRequest);
}
+ @Override
+ public GetCustomEntityTypeResult getCustomEntityType(GetCustomEntityTypeRequest getCustomEntityTypeRequest) {
+ return decoratedAwsGlue.getCustomEntityType(getCustomEntityTypeRequest);
+ }
+
@Override
public GetDataCatalogEncryptionSettingsResult getDataCatalogEncryptionSettings(GetDataCatalogEncryptionSettingsRequest getDataCatalogEncryptionSettingsRequest) {
return decoratedAwsGlue.getDataCatalogEncryptionSettings(getDataCatalogEncryptionSettingsRequest);
@@ -788,6 +904,16 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.getSecurityConfigurations(getSecurityConfigurationsRequest);
}
+ @Override
+ public GetSessionResult getSession(GetSessionRequest getSessionRequest) {
+ return decoratedAwsGlue.getSession(getSessionRequest);
+ }
+
+ @Override
+ public GetStatementResult getStatement(GetStatementRequest getStatementRequest) {
+ return decoratedAwsGlue.getStatement(getStatementRequest);
+ }
+
@Override
public GetTableResult getTable(GetTableRequest getTableRequest) {
return decoratedAwsGlue.getTable(getTableRequest);
@@ -823,6 +949,21 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.getTriggers(getTriggersRequest);
}
+ @Override
+ public GetUnfilteredPartitionMetadataResult getUnfilteredPartitionMetadata(GetUnfilteredPartitionMetadataRequest getUnfilteredPartitionMetadataRequest) {
+ return decoratedAwsGlue.getUnfilteredPartitionMetadata(getUnfilteredPartitionMetadataRequest);
+ }
+
+ @Override
+ public GetUnfilteredPartitionsMetadataResult getUnfilteredPartitionsMetadata(GetUnfilteredPartitionsMetadataRequest getUnfilteredPartitionsMetadataRequest) {
+ return decoratedAwsGlue.getUnfilteredPartitionsMetadata(getUnfilteredPartitionsMetadataRequest);
+ }
+
+ @Override
+ public GetUnfilteredTableMetadataResult getUnfilteredTableMetadata(GetUnfilteredTableMetadataRequest getUnfilteredTableMetadataRequest) {
+ return decoratedAwsGlue.getUnfilteredTableMetadata(getUnfilteredTableMetadataRequest);
+ }
+
@Override
public GetUserDefinedFunctionResult getUserDefinedFunction(GetUserDefinedFunctionRequest getUserDefinedFunctionRequest) {
return decoratedAwsGlue.getUserDefinedFunction(getUserDefinedFunctionRequest);
@@ -858,11 +999,26 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.importCatalogToGlue(importCatalogToGlueRequest);
}
+ @Override
+ public ListBlueprintsResult listBlueprints(ListBlueprintsRequest listBlueprintsRequest) {
+ return decoratedAwsGlue.listBlueprints(listBlueprintsRequest);
+ }
+
@Override
public ListCrawlersResult listCrawlers(ListCrawlersRequest listCrawlersRequest) {
return decoratedAwsGlue.listCrawlers(listCrawlersRequest);
}
+ @Override
+ public ListCrawlsResult listCrawls(ListCrawlsRequest listCrawlsRequest) {
+ return decoratedAwsGlue.listCrawls(listCrawlsRequest);
+ }
+
+ @Override
+ public ListCustomEntityTypesResult listCustomEntityTypes(ListCustomEntityTypesRequest listCustomEntityTypesRequest) {
+ return decoratedAwsGlue.listCustomEntityTypes(listCustomEntityTypesRequest);
+ }
+
@Override
public ListDevEndpointsResult listDevEndpoints(ListDevEndpointsRequest listDevEndpointsRequest) {
return decoratedAwsGlue.listDevEndpoints(listDevEndpointsRequest);
@@ -893,6 +1049,16 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return null;
}
+ @Override
+ public ListSessionsResult listSessions(ListSessionsRequest listSessionsRequest) {
+ return decoratedAwsGlue.listSessions(listSessionsRequest);
+ }
+
+ @Override
+ public ListStatementsResult listStatements(ListStatementsRequest listStatementsRequest) {
+ return decoratedAwsGlue.listStatements(listStatementsRequest);
+ }
+
@Override
public ListTriggersResult listTriggers(ListTriggersRequest listTriggersRequest) {
return decoratedAwsGlue.listTriggers(listTriggersRequest);
@@ -948,6 +1114,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.searchTables(searchTablesRequest);
}
+ @Override
+ public StartBlueprintRunResult startBlueprintRun(StartBlueprintRunRequest startBlueprintRunRequest) {
+ return decoratedAwsGlue.startBlueprintRun(startBlueprintRunRequest);
+ }
+
@Override
public StartCrawlerResult startCrawler(StartCrawlerRequest startCrawlerRequest) {
return decoratedAwsGlue.startCrawler(startCrawlerRequest);
@@ -1003,6 +1174,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.stopCrawlerSchedule(stopCrawlerScheduleRequest);
}
+ @Override
+ public StopSessionResult stopSession(StopSessionRequest stopSessionRequest) {
+ return decoratedAwsGlue.stopSession(stopSessionRequest);
+ }
+
@Override
public StopTriggerResult stopTrigger(StopTriggerRequest stopTriggerRequest) {
return decoratedAwsGlue.stopTrigger(stopTriggerRequest);
@@ -1023,6 +1199,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.untagResource(untagResourceRequest);
}
+ @Override
+ public UpdateBlueprintResult updateBlueprint(UpdateBlueprintRequest updateBlueprintRequest) {
+ return decoratedAwsGlue.updateBlueprint(updateBlueprintRequest);
+ }
+
@Override
public UpdateClassifierResult updateClassifier(UpdateClassifierRequest updateClassifierRequest) {
return decoratedAwsGlue.updateClassifier(updateClassifierRequest);
@@ -1124,6 +1305,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.resumeWorkflowRun(resumeWorkflowRunRequest);
}
+ @Override
+ public RunStatementResult runStatement(RunStatementRequest runStatementRequest) {
+ return decoratedAwsGlue.runStatement(runStatementRequest);
+ }
+
@Override
public GetResourcePoliciesResult getResourcePolicies(GetResourcePoliciesRequest getResourcePoliciesRequest) {
return decoratedAwsGlue.getResourcePolicies(getResourcePoliciesRequest);
@@ -1149,5 +1335,8 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.deleteColumnStatisticsForPartition(deleteColumnStatisticsForPartitionRequest);
}
+ @Override
+ public BatchGetBlueprintsResult batchGetBlueprints(BatchGetBlueprintsRequest batchGetBlueprintsRequest) {
+ return decoratedAwsGlue.batchGetBlueprints(batchGetBlueprintsRequest);
+ }
}
-
diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SystemController.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SystemController.java
index 1bcc7bfc8c..6c37aef111 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SystemController.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/SystemController.java
@@ -17,7 +17,9 @@
package org.apache.doris.httpv2.controller;
+import org.apache.commons.validator.routines.UrlValidator;
import org.apache.doris.analysis.RedirectStatus;
+import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.Env;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.proc.ProcDirInterface;
@@ -35,7 +37,6 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.commons.validator.routines.UrlValidator;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.http.ResponseEntity;
@@ -114,7 +115,7 @@ public class SystemController extends BaseController {
return ResponseEntityBuilder.internalError("Failed to get result from master");
}
- columnNames = resultSet.getMetaData().getColumns().stream().map(c -> c.getName()).collect(
+ columnNames = resultSet.getMetaData().getColumns().stream().map(Column::getName).collect(
Collectors.toList());
rows = resultSet.getResultRows();
} else {
@@ -184,6 +185,11 @@ public class SystemController extends BaseController {
return entity;
}
+ private boolean checkUrlIsValidate(String url) {
+ UrlValidator validator = new UrlValidator();
+ return validator.isValid(url);
+ }
+
private String getParentUrl(String pathStr) {
Path path = Paths.get(pathStr);
path = path.getParent();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendOptions.java b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendOptions.java
index 4f864bfc2d..4538197047 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendOptions.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendOptions.java
@@ -17,13 +17,13 @@
package org.apache.doris.service;
+import com.alibaba.fastjson2.util.InetAddressValidator;
import org.apache.doris.common.CIDR;
import org.apache.doris.common.Config;
import org.apache.doris.common.util.NetUtils;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
-import org.apache.commons.validator.routines.InetAddressValidator;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java b/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java
index 17e121eefb..d479e4e1bb 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/system/SystemInfoService.java
@@ -17,6 +17,7 @@
package org.apache.doris.system;
+import com.alibaba.fastjson2.util.InetAddressValidator;
import org.apache.doris.analysis.ModifyBackendClause;
import org.apache.doris.catalog.Database;
import org.apache.doris.catalog.DiskInfo;
@@ -44,7 +45,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
-import org.apache.commons.validator.routines.InetAddressValidator;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/fe/hive-udf/pom.xml b/fe/hive-udf/pom.xml
index 40743f8ada..f311917e5a 100644
--- a/fe/hive-udf/pom.xml
+++ b/fe/hive-udf/pom.xml
@@ -36,31 +36,8 @@ under the License.
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- <version>${hive.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.pentaho</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper:zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>hive-shade-3</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
<dependency>
diff --git a/fe/java-udf/pom.xml b/fe/java-udf/pom.xml
index e28cfb8470..ce4b307ae5 100644
--- a/fe/java-udf/pom.xml
+++ b/fe/java-udf/pom.xml
@@ -56,23 +56,8 @@ under the License.
</exclusions>
</dependency-->
<dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- <version>${hive.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.pentaho</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>commons-httpclient</artifactId>
- <groupId>commons-httpclient</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>hive-shade-3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -85,10 +70,10 @@ under the License.
<version>4.5.13</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.oracle.database.jdbc/ojdbc6 -->
+ <!-- https://mvnrepository.com/artifact/com.oracle.database.jdbc/ojdbc6 -->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>11.2.0.4</version>
+ <artifactId>ojdbc8</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/com.alibaba/druid -->
diff --git a/fe/pom.xml b/fe/pom.xml
index 0f07750bb7..18b3ea1590 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>23</version>
+ <version>25</version>
</parent>
<groupId>org.apache.doris</groupId>
<artifactId>fe</artifactId>
@@ -69,6 +69,11 @@ under the License.
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.5</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -86,9 +91,22 @@ under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${maven-dependency-plugin.version}</version>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
@@ -129,6 +147,7 @@ under the License.
<configLocation>check/checkstyle/checkstyle.xml</configLocation>
<suppressionsLocation>check/checkstyle/suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
+ <skip>true</skip>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
@@ -161,40 +180,47 @@ under the License.
</modules>
<properties>
<doris.home>${basedir}/../</doris.home>
+ <revision>1.2-SNAPSHOT</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
+ <owasp-dependency-check-maven.version>8.1.1</owasp-dependency-check-maven.version>
+ <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
+
<sonar.organization>apache</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
-
<cglib.version>2.2</cglib.version>
<commons-cli.version>1.4</commons-cli.version>
+ <commons-filerupload.version>1.5</commons-filerupload.version>
<commons-codec.version>1.13</commons-codec.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.9</commons-lang3.version>
<commons-pool2.version>2.2</commons-pool2.version>
<commons-validator.version>1.7</commons-validator.version>
- <gson.version>2.8.6</gson.version>
- <guava.version>29.0-jre</guava.version>
- <jackson.version>2.12.3</jackson.version>
- <jackson-mapper-asl.version>1.9.13</jackson-mapper-asl.version>
+ <gson.version>2.8.9</gson.version>
+ <guava.version>30.0-jre</guava.version>
+ <jackson.version>2.14.2</jackson.version>
<java-cup.version>0.11-a-czt02-cdh</java-cup.version>
<javassist.version>3.18.2-GA</javassist.version>
<javax.servlet-api.version>3.0.1</javax.servlet-api.version>
- <je.version>18.3.13-doris-SNAPSHOT</je.version>
+ <je.version>18.3.14-doris-SNAPSHOT</je.version>
<jflex.version>1.4.3</jflex.version>
<jmockit.version>1.49</jmockit.version>
- <commons-io.version>2.6</commons-io.version>
+ <commons-io.version>2.7</commons-io.version>
<json-simple.version>1.1.1</json-simple.version>
<junit.version>5.8.2</junit.version>
<druid.version>1.2.5</druid.version>
<thrift.version>0.13.0</thrift.version>
+ <tomcat-embed-core.version>8.5.86</tomcat-embed-core.version>
<log4j2.version>2.18.0</log4j2.version>
+ <log4j-1.2.version>2.18.0</log4j-1.2.version>
+ <slf4j.version>2.0.6</slf4j.version>
<metrics-core.version>4.0.2</metrics-core.version>
- <netty-all.version>4.1.42.Final</netty-all.version>
+ <netty-all.version>4.1.89.Final</netty-all.version>
<objenesis.version>2.1</objenesis.version>
- <grpc.version>1.30.0</grpc.version>
- <protobuf.version>3.14.0</protobuf.version>
+ <grpc.version>1.39.0</grpc.version>
+ <check.freamework.version>3.32.0</check.freamework.version>
+ <protobuf.version>3.21.12</protobuf.version>
<protoparser.version>3.1.5</protoparser.version>
<snappy-java.version>1.1.7.2</snappy-java.version>
<automaton.version>1.11-8</automaton.version>
@@ -202,33 +228,36 @@ under the License.
<kubernetes-client.version>5.12.2</kubernetes-client.version>
<kubernetes-model.version>5.12.2</kubernetes-model.version>
<logging-interceptor.version>4.7.2</logging-interceptor.version>
- <okhttp.version>4.7.2</okhttp.version>
+ <okhttp.version>4.9.3</okhttp.version>
+ <websocket.version>9.4.49.v20220914</websocket.version>
<okhttp-ws.version>3.4.2</okhttp-ws.version>
<okio.version>2.6.0</okio.version>
- <snakeyaml.version>1.15</snakeyaml.version>
+ <snakeyaml.version>2.0</snakeyaml.version>
<validation-api.version>1.1.0.Final</validation-api.version>
<zjsonpatch.version>0.2.3</zjsonpatch.version>
- <slf4j.version>1.7.5</slf4j.version>
- <kafka-clients.version>0.10.1.1</kafka-clients.version>
+ <kafka-clients.version>3.4.0</kafka-clients.version>
<oshi-core.version>4.0.0</oshi-core.version>
- <xnio-nio.version>3.6.5.Final</xnio-nio.version>
+ <xnio-nio.version>3.8.8.Final</xnio-nio.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<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>2.4.6</spark.version>
<hive.version>3.1.3</hive.version>
- <calcite.version>1.32.0</calcite.version>
+ <calcite.version>1.33.0</calcite.version>
<avatica.version>1.22.0</avatica.version>
<!-- ATTN: avro version must be consistent with Iceberg version -->
<!-- Please modify iceberg.version and avro.version together,
you can find avro version info in iceberg mvn repository -->
<iceberg.version>1.1.0</iceberg.version>
- <avro.version>1.10.1</avro.version>
+ <avro.version>1.11.1</avro.version>
<!-- hudi -->
<hudi.version>0.10.0</hudi.version>
<parquet.version>1.10.1</parquet.version>
<commons-collections.version>3.2.2</commons-collections.version>
+ <commons-compress.version>1.22</commons-compress.version>
+ <hibernate.validator.version>8.0.0.Final</hibernate.validator.version>
+ <bouncycastle.version>1.69</bouncycastle.version>
<scala.version>2.12.10</scala.version>
<kryo.version>4.0.2</kryo.version>
<lombok.version>1.18.24</lombok.version>
@@ -236,13 +265,17 @@ 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.31</aws-java-sdk.version>
+ <aws-java-sdk.version>1.12.302</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.3</hadoop.version>
+ <hadoop.version>3.3.4</hadoop.version>
<joda.version>2.8.1</joda.version>
- <revision>1.2-SNAPSHOT</revision>
<project.scm.id>github</project.scm.id>
+ <!--Spring boot 3.X requires at least JDK17-->
+ <spring.version>2.7.9</spring.version>
+ <zookeeper.version>3.4.14</zookeeper.version>
+ <ojdbc8.version>12.2.0.1</ojdbc8.version>
+ <doris.shade.version>1.0.1-SNAPSHOT</doris.shade.version>
</properties>
<profiles>
<!-- for custom internal repository -->
@@ -310,7 +343,31 @@ under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
- <scope>compile</scope>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/net.minidev/json-smart -->
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <version>2.4.10</version>
+ </dependency>
+
+ <!-- https://mvnrepository.com/artifact/org.apache.zookeeper/zookeeper -->
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${hibernate.validator.version}</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -334,6 +391,13 @@ under the License.
<artifactId>commons-cli</artifactId>
<version>${commons-cli.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${commons-filerupload.version}</version>
+ </dependency>
+
<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
<dependency>
<groupId>commons-codec</groupId>
@@ -380,15 +444,9 @@ under the License.
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson</artifactId>
+ <artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-mapper-asl -->
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson-mapper-asl.version}</version>
- </dependency>
<!-- https://mvnrepository.com/artifact/net.sourceforge.czt.dev/java-cup -->
<dependency>
<groupId>net.sourceforge.czt.dev</groupId>
@@ -406,7 +464,6 @@ under the License.
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet-api.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.doris</groupId>
@@ -436,6 +493,16 @@ under the License.
<artifactId>json-simple</artifactId>
<version>${json-simple.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>kerby-shade-1.0</artifactId>
+ <version>${doris.shade.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.oracle.database.jdbc</groupId>
+ <artifactId>ojdbc8</artifactId>
+ <version>${ojdbc8.version}</version>
+ </dependency>
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
<dependency>
<groupId>org.junit.jupiter</groupId>
@@ -450,39 +517,64 @@ under the License.
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
+ <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-params -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.thrift/libthrift -->
+ <!-- <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>${thrift.version}</version>
+ <exclusions>
+ <!– thrift 0.13 depends on httpclient 4.5.10, should exclude it –>
+ <exclusion>
+ <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>httpcore</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>-->
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
- <exclusions>
- <!-- thrift 0.13 depends on httpclient 4.5.10, should exclude it -->
- <exclusion>
- <artifactId>httpclient</artifactId>
- <groupId>org.apache.httpcomponents</groupId>
- </exclusion>
- <exclusion>
- <artifactId>httpcore</artifactId>
- <groupId>org.apache.httpcomponents</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>thrift-shade-0.13</artifactId>
+ <version>${doris.shade.version}</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
+ <artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
+ <artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-core -->
@@ -496,6 +588,7 @@ under the License.
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty-all.version}</version>
+ <scope>import</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.objenesis/objenesis -->
<dependency>
@@ -524,6 +617,11 @@ under the License.
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker</artifactId>
+ <version>${check.freamework.version}</version>
+ </dependency>
<!-- https://mvnrepository.com/artifact/com.squareup/protoparser -->
<dependency>
<groupId>com.squareup</groupId>
@@ -536,6 +634,13 @@ under the License.
<artifactId>snappy-java</artifactId>
<version>${snappy-java.version}</version>
</dependency>
+ <!-- https://mvnrepository.com/artifact/org.apache.parquet/parquet-hadoop-bundle -->
+ <dependency>
+ <groupId>org.apache.parquet</groupId>
+ <artifactId>parquet-hadoop-bundle</artifactId>
+ <version>1.12.3</version>
+ </dependency>
+
<!-- for k8s client-->
<!-- https://mvnrepository.com/artifact/dk.brics.automaton/automaton -->
<dependency>
@@ -597,6 +702,57 @@ under the License.
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
</dependency>
+ <!-- https://mvnrepository.com/artifact/org.eclipse.jetty.websocket/websocket-client -->
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-client</artifactId>
+ <version>${websocket.version}</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-server -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.51.v20230217</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>9.4.51.v20230217</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-xml</artifactId>
+ <version>9.4.51.v20230217</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>9.4.51.v20230217</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>9.4.51.v20230217</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>9.4.51.v20230217</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-rewrite</artifactId>
+ <version>9.4.51.v20230217</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>9.4.51.v20230217</version>
+ </dependency>
+
+
<!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp-ws -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
@@ -624,9 +780,19 @@ under the License.
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>slf4j-1.2-api</artifactId>
+ <version>${slf4j-1.2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>${log4j-1.2.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
@@ -674,6 +840,7 @@ under the License.
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.12</artifactId>
<version>${spark.version}</version>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -698,6 +865,7 @@ under the License.
<groupId>org.apache.spark</groupId>
<artifactId>spark-launcher_2.12</artifactId>
<version>${spark.version}</version>
+ <scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.spark/spark-sql_2.12 -->
<dependency>
@@ -707,96 +875,27 @@ under the License.
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
- <version>${hive.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <artifactId>servlet-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- <exclusion>
- <groupId>jdk.tools</groupId>
- <artifactId>jdk.tools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- </exclusion>
- <!-- confilict with parquet version in iceberg -->
- <exclusion>
- <groupId>org.apache.parquet</groupId>
- <artifactId>parquet-hadoop-bundle</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>hive-uber</artifactId>
+ <classifier>optional</classifier>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- <classifier>core</classifier>
- <version>${hive.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.pentaho</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-vector-code-gen</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-llap-tez</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-shims</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-registry</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>spring-shade-5</artifactId>
+ <version>${doris.shade.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>hive-shade-3</artifactId>
+ <version>${doris.shade.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>${hadoop.version}</version>
- <scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>servlet-api</artifactId>
@@ -836,12 +935,15 @@ under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
- <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.kerby</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
@@ -850,9 +952,20 @@ under the License.
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-xc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ </exclusion>
</exclusions>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-core -->
<dependency>
<groupId>org.apache.iceberg</groupId>
@@ -881,17 +994,25 @@ under the License.
<version>${hudi.version}</version>
<exclusions>
<exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-storage-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.hudi/hudi-hadoop-mr -->
<dependency>
- <groupId>org.apache.hudi</groupId>
- <artifactId>hudi-hadoop-mr</artifactId>
- <version>${hudi.version}</version>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>hudi-mr-shade-0.13</artifactId>
+ <version>${doris.shade.version}</version>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
@@ -903,25 +1024,36 @@ under the License.
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-column</artifactId>
<version>${parquet.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-hadoop</artifactId>
<version>${parquet.version}</version>
- <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-common</artifactId>
<version>${parquet.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>${commons-collections.version}</version>
- <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>${commons-compress.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
@@ -933,7 +1065,6 @@ under the License.
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo-shaded</artifactId>
<version>${kryo.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
@@ -984,7 +1115,7 @@ under the License.
<artifactId>aws-java-sdk-dynamodb</artifactId>
<version>${aws-java-sdk.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>${mariadb-java-client.version}</version>
@@ -1005,8 +1136,49 @@ under the License.
<artifactId>joda-time</artifactId>
<version>${joda.version}</version>
</dependency>
+ <!--tomcat-->
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat-embed-core.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <!-- test dependency -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jmockit</groupId>
+ <artifactId>jmockit</artifactId>
+ </dependency>
+ </dependencies>
<reporting>
<plugins>
<plugin>
@@ -1015,4 +1187,15 @@ under the License.
</plugin>
</plugins>
</reporting>
+ <repositories>
+ <!--todo waiting hive-catalog release-->
+ <repository>
+ <id>snapshots</id>
+ <name>apache snapshots maven repo https</name>
+ <url>https://repository.apache.org/content/repositories/snapshots/</url>
+ <snapshots>
+ <updatePolicy>always</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
diff --git a/fe/spark-dpp/pom.xml b/fe/spark-dpp/pom.xml
index a494274aa9..46f8788f94 100644
--- a/fe/spark-dpp/pom.xml
+++ b/fe/spark-dpp/pom.xml
@@ -42,13 +42,11 @@ under the License.
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
<dependency>
@@ -113,27 +111,22 @@ under the License.
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-column</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-hadoop</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-common</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
@@ -143,7 +136,6 @@ under the License.
<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo-shaded</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
diff --git a/fs_brokers/apache_hdfs_broker/pom.xml b/fs_brokers/apache_hdfs_broker/pom.xml
index 243f625afe..b8c07d0b8e 100644
--- a/fs_brokers/apache_hdfs_broker/pom.xml
+++ b/fs_brokers/apache_hdfs_broker/pom.xml
@@ -69,9 +69,59 @@ under the License.
<maven.compiler.target>1.8</maven.compiler.target>
<log4j2.version>2.18.0</log4j2.version>
<project.scm.id>github</project.scm.id>
- <hadoop.version>2.10.2</hadoop.version>
- <netty.version>4.1.65.Final</netty.version>
+ <doris.shade.version>1.0.1-SNAPSHOT</doris.shade.version>
+
+ <netty.version>4.1.89.Final</netty.version>
+ <owasp-dependency-check-maven.version>8.1.1</owasp-dependency-check-maven.version>
+ <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-collections4 -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.11.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>30.0-jre</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>hadoop-shade-2</artifactId>
+ <version>${doris.shade.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>thrift-shade-0.13</artifactId>
+ <version>${doris.shade.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>hadoop-cloud-shade-2</artifactId>
+ <version>${doris.shade.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>hadoop-aws-shade-2</artifactId>
+ <version>${doris.shade.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
<profiles>
<!-- for custom internal repository -->
<profile>
@@ -128,6 +178,7 @@ under the License.
</pluginRepositories>
</profile>
</profiles>
+
<dependencies>
<!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
<dependency>
@@ -143,15 +194,28 @@ under the License.
</dependency>
<!-- https://mvnrepository.com/artifact/commons-collections/commons-collections -->
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-configuration/commons-configuration -->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-daemon/commons-daemon -->
<dependency>
@@ -159,11 +223,26 @@ under the License.
<artifactId>commons-daemon</artifactId>
<version>1.0.13</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>hadoop-shade-2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>hadoop-aws-shade-2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>hadoop-cloud-shade-2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>thrift-shade-0.13</artifactId>
+ </dependency>
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-lang/commons-lang -->
<dependency>
@@ -184,55 +263,21 @@ under the License.
<version>1.1.3</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+ <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>15.0</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-annotations -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-annotations</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-auth -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-auth</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-common -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-hdfs -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>netty-all</artifactId>
- <groupId>io.netty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jackson-databind</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- </exclusions>
</dependency>
+
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.14.1</version>
+ <version>2.14.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>${netty.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.htrace/htrace-core -->
@@ -245,15 +290,9 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.thrift/libthrift -->
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.13.0</version>
- </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -270,7 +309,7 @@ under the License.
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>2.5.0</version>
+ <version>3.21.12</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
<dependency>
@@ -291,43 +330,6 @@ under the License.
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-aws</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/com.huaweicloud/esdk-obs-java-bundle -->
- <dependency>
- <groupId>com.huaweicloud</groupId>
- <artifactId>esdk-obs-java-bundle</artifactId>
- <version>3.21.8</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-huaweicloud -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-huaweicloud</artifactId>
- <version>2.8.3</version>
- <exclusions>
- <exclusion>
- <artifactId>jackson-databind</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aliyun -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-aliyun</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
-
- <!-- https://mvnrepository.com/artifact/com.qcloud.cos/hadoop-cos -->
- <dependency>
- <groupId>com.qcloud.cos</groupId>
- <artifactId>hadoop-cos</artifactId>
- <version>2.8.5-8.1.8</version>
- </dependency>
</dependencies>
<build>
<finalName>apache_hdfs_broker</finalName>
@@ -377,7 +379,7 @@ under the License.
<artifactId>maven-thrift-plugin</artifactId>
<version>0.1.11</version>
<configuration>
- <thriftExecutable>${env.DORIS_THIRDPARTY}/installed/bin/thrift</thriftExecutable>
+ <thriftExecutable>${palo.home}/thirdparty/installed/bin/thrift</thriftExecutable>
<thriftSourceRoot>${basedir}/src/main/resources/thrift/</thriftSourceRoot>
<outputDirectory>${basedir}/src/main/thrift/</outputDirectory>
<generator>java:fullcamel</generator>
@@ -410,6 +412,7 @@ under the License.
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
+ <includeScope>runtime</includeScope>
<skip>${skip.plugin}</skip>
</configuration>
</execution>
@@ -428,9 +431,22 @@ under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${maven-dependency-plugin.version}</version>
+ </plugin>
<!--set for ecplise lifecycle -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@ -526,4 +542,14 @@ under the License.
</plugins>
</pluginManagement>
</build>
+ <repositories>
+ <repository>
+ <id>snapshots</id>
+ <name>apache snapshots maven repo https</name>
+ <url>https://repository.apache.org/content/repositories/snapshots/</url>
+ <snapshots>
+ <updatePolicy>always</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org