This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new d02422d45a9 branch-4.0: [chore](dep)Upgrade Shade #58071 (#58581)
d02422d45a9 is described below
commit d02422d45a91947607a0b242c27c61b7155d69f7
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Dec 2 09:44:21 2025 +0800
branch-4.0: [chore](dep)Upgrade Shade #58071 (#58581)
Cherry-picked from #58071
Co-authored-by: Calvin Kirs <[email protected]>
---
build.sh | 26 ++++++--
fe/be-java-extensions/preload-extensions/pom.xml | 8 +++
fe/fe-core/pom.xml | 47 +++-----------
fe/pom.xml | 83 +++++++++++++++++++++++-
4 files changed, 118 insertions(+), 46 deletions(-)
diff --git a/build.sh b/build.sh
index 41041ae3f66..58c938e83c4 100755
--- a/build.sh
+++ b/build.sh
@@ -165,6 +165,8 @@ BUILD_INDEX_TOOL='OFF'
BUILD_BENCHMARK='OFF'
BUILD_TASK_EXECUTOR_SIMULATOR='OFF'
BUILD_BE_JAVA_EXTENSIONS=0
+BUILD_OBS_DEPENDENCIES=1
+BUILD_COS_DEPENDENCIES=1
BUILD_HIVE_UDF=0
CLEAN=0
HELP=0
@@ -245,6 +247,14 @@ else
BUILD_BE_JAVA_EXTENSIONS=1
shift
;;
+ --exclude-obs-dependencies)
+ BUILD_OBS_DEPENDENCIES=0
+ shift
+ ;;
+ --exclude-cos-dependencies)
+ BUILD_COS_DEPENDENCIES=0
+ shift
+ ;;
--clean)
CLEAN=1
shift
@@ -725,18 +735,26 @@ if [[ "${FE_MODULES}" != '' ]]; then
if [[ "${CLEAN}" -eq 1 ]]; then
clean_fe
fi
+ DEPENDENCIES_MVN_OPTS=" "
+ if [[ "${BUILD_OBS_DEPENDENCIES}" -eq 0 ]]; then
+ DEPENDENCIES_MVN_OPTS+=" -Dobs.dependency.scope=provided "
+ fi
+ if [[ "${BUILD_COS_DEPENDENCIES}" -eq 0 ]]; then
+ DEPENDENCIES_MVN_OPTS+=" -Dcos.dependency.scope=provided "
+ fi
+
if [[ "${DISABLE_JAVA_CHECK_STYLE}" = "ON" ]]; then
# Allowed user customer set env param USER_SETTINGS_MVN_REPO means
settings.xml file path
if [[ -n ${USER_SETTINGS_MVN_REPO} && -f ${USER_SETTINGS_MVN_REPO} ]];
then
- "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}}
-Dskip.doc=true -DskipTests -Dcheckstyle.skip=true ${MVN_OPT:+${MVN_OPT}} -gs
"${USER_SETTINGS_MVN_REPO}" -T 1C
+ "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}}
-Dskip.doc=true -DskipTests -Dcheckstyle.skip=true ${MVN_OPT:+${MVN_OPT}}
${DEPENDENCIES_MVN_OPTS} -gs "${USER_SETTINGS_MVN_REPO}" -T 1C
else
- "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}}
-Dskip.doc=true -DskipTests -Dcheckstyle.skip=true ${MVN_OPT:+${MVN_OPT}} -T 1C
+ "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}}
-Dskip.doc=true -DskipTests -Dcheckstyle.skip=true ${MVN_OPT:+${MVN_OPT}}
${DEPENDENCIES_MVN_OPTS} -T 1C
fi
else
if [[ -n ${USER_SETTINGS_MVN_REPO} && -f ${USER_SETTINGS_MVN_REPO} ]];
then
- "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}}
-Dskip.doc=true -DskipTests ${MVN_OPT:+${MVN_OPT}} -gs
"${USER_SETTINGS_MVN_REPO}" -T 1C
+ "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}}
-Dskip.doc=true -DskipTests ${MVN_OPT:+${MVN_OPT}} ${DEPENDENCIES_MVN_OPTS}
-gs "${USER_SETTINGS_MVN_REPO}" -T 1C
else
- "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}}
-Dskip.doc=true -DskipTests ${MVN_OPT:+${MVN_OPT}} -T 1C
+ "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}}
-Dskip.doc=true -DskipTests ${MVN_OPT:+${MVN_OPT}} ${DEPENDENCIES_MVN_OPTS} -T
1C
fi
fi
cd "${DORIS_HOME}"
diff --git a/fe/be-java-extensions/preload-extensions/pom.xml
b/fe/be-java-extensions/preload-extensions/pom.xml
index 95c81d38814..fdbf4f1c0f9 100644
--- a/fe/be-java-extensions/preload-extensions/pom.xml
+++ b/fe/be-java-extensions/preload-extensions/pom.xml
@@ -81,6 +81,14 @@ under the License.
<artifactId>antlr4-runtime</artifactId>
<version>${antlr4.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
<dependency>
<!-- version of spark's jackson module is error -->
<groupId>com.fasterxml.jackson.module</groupId>
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index d759acdf690..39bffb74ebb 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -32,7 +32,6 @@ under the License.
<doris.home>${basedir}/../../</doris.home>
<doris.thirdparty>${basedir}/../../thirdparty</doris.thirdparty>
<fe_ut_parallel>1</fe_ut_parallel>
- <huaweiobs.version>3.1.1-hw-46</huaweiobs.version>
</properties>
<profiles>
<profile>
@@ -168,11 +167,14 @@ under the License.
<artifactId>java-ipv6</artifactId>
<version>0.17</version>
</dependency>
- <!--
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>je</artifactId>
@@ -269,26 +271,10 @@ under the License.
<dependency>
<groupId>com.huaweicloud</groupId>
<artifactId>hadoop-huaweicloud</artifactId>
- <version>${huaweiobs.version}</version>
- <scope>${obs.dependency.scope}</scope>
- <exclusions>
- <exclusion>
- <artifactId>jackson-databind</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.qcloud.cos</groupId>
<artifactId>hadoop-cos</artifactId>
- <version>${tencentcos.version}</version>
- <scope>${cos.dependency.scope}</scope>
- <exclusions>
- <exclusion>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- antl4 The version of antlr-runtime in trino parser is need to be
consistent with doris,
when upgrade doris antlr-runtime version, should take care of
trino-parser.-->
@@ -365,19 +351,16 @@ under the License.
<dependency>
<groupId>com.tencentcloudapi</groupId>
<artifactId>tencentcloud-sdk-java-sts</artifactId>
- <version>3.1.678</version>
</dependency>
<!-- huawei cloud sts -->
<dependency>
<groupId>com.huaweicloud.sdk</groupId>
<artifactId>huaweicloud-sdk-iam</artifactId>
- <version>3.1.20</version>
</dependency>
<!-- Fix it-->
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>4.0.3</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
@@ -618,36 +601,22 @@ under the License.
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </dependency>
<dependency>
<groupId>com.qcloud</groupId>
<artifactId>cos_api</artifactId>
- <version>5.6.211</version>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.qcloud</groupId>
<artifactId>qcloud-java-sdk</artifactId>
- <version>2.0.1</version>
</dependency>
<dependency>
<groupId>com.huaweicloud</groupId>
<artifactId>esdk-obs-java-bundle</artifactId>
- <version>[3.21.11,)</version>
- <scope>${obs.dependency.scope}</scope>
</dependency>
<dependency>
<groupId>com.baidubce</groupId>
diff --git a/fe/pom.xml b/fe/pom.xml
index ef6b50f3272..b8bf5dc3fe1 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -221,7 +221,7 @@ under the License.
<module>be-java-extensions</module>
</modules>
<properties>
-
<doris.hive.catalog.shade.version>3.0.1</doris.hive.catalog.shade.version>
+
<doris.hive.catalog.shade.version>3.1.0</doris.hive.catalog.shade.version>
<!-- iceberg 1.9.1 depends avro on 1.12 -->
<avro.version>1.12.1</avro.version>
<parquet.version>1.16.0</parquet.version>
@@ -231,6 +231,13 @@ under the License.
<obs.dependency.scope>compile</obs.dependency.scope>
<cos.dependency.scope>compile</cos.dependency.scope>
<gcs.dependency.scope>compile</gcs.dependency.scope>
+ <qcloud-java-sdk.version>2.0.1</qcloud-java-sdk.version>
+ <tencentcos.version>8.2.7</tencentcos.version>
+ <cos-api.version>5.6.211</cos-api.version>
+
<tencentcloud-sdk-java-sts.version>3.1.678</tencentcloud-sdk-java-sts.version>
+ <huaweicloud-sdk-iam.version>3.1.20</huaweicloud-sdk-iam.version>
+ <esdk-obs.version>[3.21.11,)</esdk-obs.version>
+ <huaweiobs.version>3.1.1-hw-46</huaweiobs.version>
<!--suppress UnresolvedMavenProperty -->
<doris.thirdparty>${fe.dir}/../thirdparty</doris.thirdparty>
<!--suppress UnresolvedMavenProperty -->
@@ -374,8 +381,6 @@ under the License.
<aircompressor.version>0.27</aircompressor.version>
<!-- paimon -->
<paimon.version>1.1.1</paimon.version>
- <!-- tencent cosn -->
- <tencentcos.version>8.2.7</tencentcos.version>
<disruptor.version>3.4.4</disruptor.version>
<!-- arrow flight sql -->
<arrow.vector.classifier>shade-format-flatbuffers</arrow.vector.classifier>
@@ -1701,6 +1706,78 @@ under the License.
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!-- tencent COS -->
+ <dependency>
+ <groupId>com.qcloud</groupId>
+ <artifactId>cos_api</artifactId>
+ <version>${cos-api.version}</version>
+ <scope>${cos.dependency.scope}</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.qcloud</groupId>
+ <artifactId>qcloud-java-sdk</artifactId>
+ <version>${qcloud-java-sdk.version}</version>
+ <scope>${cos.dependency.scope}</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.qcloud.cos</groupId>
+ <artifactId>hadoop-cos</artifactId>
+ <version>${tencentcos.version}</version>
+ <scope>${cos.dependency.scope}</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- tencent cloud sts -->
+ <dependency>
+ <groupId>com.tencentcloudapi</groupId>
+ <artifactId>tencentcloud-sdk-java-sts</artifactId>
+ <version>${tencentcloud-sdk-java-sts.version}</version>
+ <scope>${cos.dependency.scope}</scope>
+ </dependency>
+ <!--Huawei OBS-->
+ <dependency>
+ <groupId>com.huaweicloud</groupId>
+ <artifactId>esdk-obs-java-bundle</artifactId>
+ <version>${esdk-obs.version}</version>
+ <scope>${obs.dependency.scope}</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.huaweicloud</groupId>
+ <artifactId>hadoop-huaweicloud</artifactId>
+ <version>${huaweiobs.version}</version>
+ <scope>${obs.dependency.scope}</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>jackson-databind</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- huawei cloud sts -->
+ <dependency>
+ <groupId>com.huaweicloud.sdk</groupId>
+ <artifactId>huaweicloud-sdk-iam</artifactId>
+ <version>${huaweicloud-sdk-iam.version}</version>
+ <scope>${obs.dependency.scope}</scope>
+ </dependency>
<dependency>
<groupId>org.semver4j</groupId>
<artifactId>semver4j</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
