This is an automated email from the ASF dual-hosted git repository.
kirs 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 fb43dc54470 branch-3.1: [chore](dep)upgrade netty and hadoop #57226
(#57608)
fb43dc54470 is described below
commit fb43dc54470ab515b8a7c42ac8c56279a398af17
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Nov 5 10:04:51 2025 +0800
branch-3.1: [chore](dep)upgrade netty and hadoop #57226 (#57608)
Cherry-picked from #57226
Co-authored-by: Calvin Kirs <[email protected]>
---
.../iceberg-metadata-scanner/pom.xml | 1 -
fe/be-java-extensions/preload-extensions/pom.xml | 7 -------
fe/fe-core/pom.xml | 14 --------------
fe/pom.xml | 21 +++++++++++++++++----
4 files changed, 17 insertions(+), 26 deletions(-)
diff --git a/fe/be-java-extensions/iceberg-metadata-scanner/pom.xml
b/fe/be-java-extensions/iceberg-metadata-scanner/pom.xml
index 798caa5cddd..26bd41e8533 100644
--- a/fe/be-java-extensions/iceberg-metadata-scanner/pom.xml
+++ b/fe/be-java-extensions/iceberg-metadata-scanner/pom.xml
@@ -60,7 +60,6 @@ under the License.
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>auth</artifactId>
- <version>${awssdk.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/fe/be-java-extensions/preload-extensions/pom.xml
b/fe/be-java-extensions/preload-extensions/pom.xml
index fc6ece7b8c4..e705edabde7 100644
--- a/fe/be-java-extensions/preload-extensions/pom.xml
+++ b/fe/be-java-extensions/preload-extensions/pom.xml
@@ -137,32 +137,26 @@ under the License.
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</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>kms</artifactId>
- <version>${awssdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>glue</artifactId>
- <version>${awssdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>dynamodb</artifactId>
- <version>${awssdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3tables</artifactId>
- <version>${awssdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.s3tables</groupId>
@@ -173,7 +167,6 @@ under the License.
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sdk-core</artifactId>
- <version>${awssdk.version}</version>
</dependency>
</dependencies>
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 69024ddc369..d4e7c6f418f 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -442,13 +442,6 @@ under the License.
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
- <version>${awssdk.version}</version>
- <exclusions>
- <!--exclusion>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>apache-client</artifactId>
- </exclusion-->
- </exclusions>
</dependency>
<!-- tencent cloud sts -->
<dependency>
@@ -640,7 +633,6 @@ under the License.
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>glue</artifactId>
- <version>${awssdk.version}</version>
<exclusions>
<exclusion>
<groupId>software.amazon.awssdk</groupId>
@@ -651,7 +643,6 @@ under the License.
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sts</artifactId>
- <version>${awssdk.version}</version>
<exclusions>
<exclusion>
<groupId>software.amazon.awssdk</groupId>
@@ -662,17 +653,14 @@ under the License.
<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>
<!-- For Iceberg, must be consistent with Iceberg version -->
<dependency>
@@ -880,7 +868,6 @@ under the License.
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3tables</artifactId>
- <version>${awssdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.s3tables</groupId>
@@ -891,7 +878,6 @@ under the License.
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sdk-core</artifactId>
- <version>${awssdk.version}</version>
</dependency>
<dependency>
<groupId>com.taobao.arthas</groupId>
diff --git a/fe/pom.xml b/fe/pom.xml
index 23e3e9dc18c..19bfccb9fa5 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -277,7 +277,7 @@ under the License.
<metrics-core.version>4.0.2</metrics-core.version>
<!--Netty 4.1.94 is not compatible with arrow flight.-->
<!--Need to ensure that the version is the same as in
arrow/java/pom.xml or compatible with it.-->
- <netty-all.version>4.1.110.Final</netty-all.version>
+ <netty-all.version>4.1.128.Final</netty-all.version>
<!--The dependence of transitive dependence cannot be ruled out, only
Saving the nation through twisted ways.-->
<netty-3-test.version>3.10.6.Final</netty-3-test.version>
<objenesis.version>2.1</objenesis.version>
@@ -287,7 +287,7 @@ under the License.
<!-- NOTE: Using grpc-java whose version is newer than 1.34.0 will
break the build on CentOS 6 due to the obsolete GLIBC -->
<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.63.0</grpc.version>
+ <grpc.version>1.65.1</grpc.version>
<check.freamework.version>3.43.0</check.freamework.version>
<protobuf.version>3.24.3</protobuf.version>
<!-- we use protoc-jar-maven-plugin to generate protobuf generated
code -->
@@ -343,7 +343,7 @@ under the License.
<httpcore.version>4.4.15</httpcore.version>
<aws-java-sdk.version>1.12.669</aws-java-sdk.version>
<mariadb-java-client.version>3.0.9</mariadb-java-client.version>
- <hadoop.version>3.3.6</hadoop.version>
+ <hadoop.version>3.4.2</hadoop.version>
<re2j.version>1.8</re2j.version>
<hadoop.thirdparty.guava.version>1.2.0</hadoop.thirdparty.guava.version>
<hadoop.thirdparty.protobuf_3_7.version>1.1.1</hadoop.thirdparty.protobuf_3_7.version>
@@ -386,7 +386,7 @@ under the License.
<azure.sdk.batch.version>12.22.0</azure.sdk.batch.version>
<semver4j.version>5.3.0</semver4j.version>
<aliyun-sdk-oss.version>3.15.0</aliyun-sdk-oss.version>
- <awssdk.version>2.29.26</awssdk.version>
+ <awssdk.version>2.37.2</awssdk.version>
<s3tables.catalog.version>0.1.4</s3tables.catalog.version>
<mockito.version>4.11.0</mockito.version>
</properties>
@@ -535,6 +535,19 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>bom</artifactId>
+ <version>${awssdk.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <!--AWS BOM does not include this dependency-->
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>bundle</artifactId>
+ <version>${awssdk.version}</version>
+ </dependency>
<!-- woodstox -->
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
