This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new fa7809aaf07 branch-3.1: [chore](dep)Remove unused dependencies #59079
(#59145)
fa7809aaf07 is described below
commit fa7809aaf07d69d84c5e3f067c702ab64f6c6525
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Dec 19 10:34:44 2025 +0800
branch-3.1: [chore](dep)Remove unused dependencies #59079 (#59145)
Cherry-picked from #59079
Co-authored-by: Calvin Kirs <[email protected]>
---
fe/be-java-extensions/hadoop-deps/pom.xml | 4 ++
fe/be-java-extensions/hadoop-hudi-scanner/pom.xml | 2 +-
fe/be-java-extensions/java-udf/pom.xml | 6 +++
fe/fe-common/pom.xml | 21 --------
.../DataLakeAWSCredentialsProvider.java | 59 ----------------------
fe/fe-core/pom.xml | 9 ++++
fe/pom.xml | 7 ++-
7 files changed, 26 insertions(+), 82 deletions(-)
diff --git a/fe/be-java-extensions/hadoop-deps/pom.xml
b/fe/be-java-extensions/hadoop-deps/pom.xml
index 186548d8f73..0a9b908f49d 100644
--- a/fe/be-java-extensions/hadoop-deps/pom.xml
+++ b/fe/be-java-extensions/hadoop-deps/pom.xml
@@ -38,6 +38,10 @@ under the License.
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-aliyun</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
diff --git a/fe/be-java-extensions/hadoop-hudi-scanner/pom.xml
b/fe/be-java-extensions/hadoop-hudi-scanner/pom.xml
index 3fddd5b08a8..79e00db2f69 100644
--- a/fe/be-java-extensions/hadoop-hudi-scanner/pom.xml
+++ b/fe/be-java-extensions/hadoop-hudi-scanner/pom.xml
@@ -52,7 +52,7 @@ under the License.
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>hadoop-deps</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/fe/be-java-extensions/java-udf/pom.xml
b/fe/be-java-extensions/java-udf/pom.xml
index 1cb1614c69f..8b1e57490dc 100644
--- a/fe/be-java-extensions/java-udf/pom.xml
+++ b/fe/be-java-extensions/java-udf/pom.xml
@@ -40,6 +40,12 @@ under the License.
<groupId>org.apache.doris</groupId>
<artifactId>java-common</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.trino</groupId>
+ <artifactId>trino-main</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.doris</groupId>
diff --git a/fe/fe-common/pom.xml b/fe/fe-common/pom.xml
index 5445ecd116d..c08528d5b26 100644
--- a/fe/fe-common/pom.xml
+++ b/fe/fe-common/pom.xml
@@ -112,31 +112,10 @@ under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aws</artifactId>
</dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-s3</artifactId>
- </dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-sts</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-iostreams</artifactId>
</dependency>
- <dependency>
- <groupId>com.aliyun.oss</groupId>
- <artifactId>aliyun-sdk-oss</artifactId>
- <version>${aliyun-sdk-oss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-aliyun</artifactId>
- </dependency>
- <dependency>
- <groupId>com.esotericsoftware</groupId>
- <artifactId>kryo-shaded</artifactId>
- </dependency>
</dependencies>
<build>
<finalName>doris-fe-common</finalName>
diff --git
a/fe/fe-common/src/main/java/org/apache/doris/common/credentials/DataLakeAWSCredentialsProvider.java
b/fe/fe-common/src/main/java/org/apache/doris/common/credentials/DataLakeAWSCredentialsProvider.java
deleted file mode 100644
index 600d4440224..00000000000
---
a/fe/fe-common/src/main/java/org/apache/doris/common/credentials/DataLakeAWSCredentialsProvider.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package org.apache.doris.common.credentials;
-
-import com.amazonaws.SdkClientException;
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.auth.BasicSessionCredentials;
-import com.amazonaws.util.StringUtils;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.s3a.Constants;
-
-public class DataLakeAWSCredentialsProvider implements AWSCredentialsProvider
{
-
- private final Configuration conf;
-
- public DataLakeAWSCredentialsProvider(Configuration conf) {
- this.conf = conf;
- }
-
- @Override
- public AWSCredentials getCredentials() {
- String accessKey = StringUtils.trim(conf.get(Constants.ACCESS_KEY));
- String secretKey = StringUtils.trim(conf.get(Constants.SECRET_KEY));
- String sessionToken =
StringUtils.trim(conf.get(Constants.SESSION_TOKEN));
- if (!StringUtils.isNullOrEmpty(accessKey) &&
!StringUtils.isNullOrEmpty(secretKey)) {
- return (StringUtils.isNullOrEmpty(sessionToken) ? new
BasicAWSCredentials(accessKey,
- secretKey) : new BasicSessionCredentials(accessKey, secretKey,
sessionToken));
- } else {
- throw new SdkClientException(
- "Unable to load AWS credentials from hive conf
(fs.s3a.access.key and fs.s3a.secret.key)");
- }
- }
-
- @Override
- public void refresh() {
- }
-
- @Override
- public String toString() {
- return getClass().getSimpleName();
- }
-}
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 1c33a9d55d1..fdf476b1bb5 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -128,6 +128,11 @@ under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-azure</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.aliyun.oss</groupId>
+ <artifactId>aliyun-sdk-oss</artifactId>
+ <version>${aliyun-sdk-oss.version}</version>
+ </dependency>
<!--
https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
@@ -411,6 +416,10 @@ under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-aws</artifactId>
+ </dependency>
<!-- lakesoul -->
<dependency>
diff --git a/fe/pom.xml b/fe/pom.xml
index a9296a7af1f..20005d0b938 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -296,7 +296,7 @@ under the License.
<grpc-java.version>1.34.0</grpc-java.version>
<!--Need to ensure that the version is the same as in
arrow/java/pom.xml or compatible with it.-->
<grpc.version>1.65.1</grpc.version>
- <check.freamework.version>3.52.0</check.freamework.version>
+ <check.freamework.version>3.52.1</check.freamework.version>
<protobuf.version>3.25.8</protobuf.version>
<!-- we use protoc-jar-maven-plugin to generate protobuf generated
code -->
<!-- see
https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/ to get correct
version -->
@@ -1861,22 +1861,27 @@ under the License.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
+ <scope>test</scope>
</dependency>
<!-- should be used in test scope -->
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
