This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new e8485a4e9a0 branch-4.1: [chore](dep) Upgrade dependencies (#65077)
e8485a4e9a0 is described below
commit e8485a4e9a088067ec3aa5a856efeeab3d1faf0e
Author: Calvin Kirs <[email protected]>
AuthorDate: Wed Jul 1 19:00:13 2026 +0800
branch-4.1: [chore](dep) Upgrade dependencies (#65077)
cherry-pick apache/doris#62858
cherry-pick apache/doris#64196
cherry-pick apache/doris#64208
---
fe/be-java-extensions/java-common/pom.xml | 5 ---
fe/be-java-extensions/preload-extensions/pom.xml | 5 ---
fe/hive-udf/pom.xml | 14 +++++++
fe/pom.xml | 49 +++++++++++++++-------
.../main/java/org/apache/doris/udf/StringTest.java | 2 +-
5 files changed, 48 insertions(+), 27 deletions(-)
diff --git a/fe/be-java-extensions/java-common/pom.xml
b/fe/be-java-extensions/java-common/pom.xml
index 883615bcf78..d09224bf6b6 100644
--- a/fe/be-java-extensions/java-common/pom.xml
+++ b/fe/be-java-extensions/java-common/pom.xml
@@ -95,11 +95,6 @@ under the License.
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
<!-- these dependencies are for iceberg-aws -->
<dependency>
<groupId>software.amazon.awssdk</groupId>
diff --git a/fe/be-java-extensions/preload-extensions/pom.xml
b/fe/be-java-extensions/preload-extensions/pom.xml
index c7d22571797..ecdecf236a3 100644
--- a/fe/be-java-extensions/preload-extensions/pom.xml
+++ b/fe/be-java-extensions/preload-extensions/pom.xml
@@ -147,11 +147,6 @@ under the License.
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
<!-- For BE CosN Access -->
<dependency>
<groupId>com.qcloud.cos</groupId>
diff --git a/fe/hive-udf/pom.xml b/fe/hive-udf/pom.xml
index 7d48ac5c0ca..a30a2a5ac6f 100644
--- a/fe/hive-udf/pom.xml
+++ b/fe/hive-udf/pom.xml
@@ -53,6 +53,20 @@ under the License.
<artifactId>hive-exec</artifactId>
<version>${hive.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.calcite</groupId>
+ <artifactId>calcite-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.calcite</groupId>
+ <artifactId>calcite-druid</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/fe/pom.xml b/fe/pom.xml
index c03a91b1b78..e1267cc64bd 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -257,8 +257,8 @@ under the License.
<commons-filerupload.version>1.6.0</commons-filerupload.version>
<commons-configuration2.version>2.11.0</commons-configuration2.version>
<commons-codec.version>1.13</commons-codec.version>
- <commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.19.0</commons-lang3.version>
+ <commons-net.version>3.13.0</commons-net.version>
<commons-pool2.version>2.2</commons-pool2.version>
<commons-pool.version>1.5.1</commons-pool.version>
<commons-text.version>1.10.0</commons-text.version>
@@ -278,14 +278,13 @@ under the License.
<hikaricp.version>6.0.0</hikaricp.version>
<thrift.version>0.16.0</thrift.version>
<tomcat-embed.version>9.0.104</tomcat-embed.version>
- <log4j2.version>2.25.3</log4j2.version>
- <log4j-1.2.version>2.25.3</log4j-1.2.version>
+ <log4j2.version>2.25.4</log4j2.version>
+ <log4j-1.2.version>2.25.4</log4j-1.2.version>
<mqtt.version>1.2.5</mqtt.version>
<slf4j.version>2.0.17</slf4j.version>
<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.130.Final</netty-all.version>
+ <!-- Keep Netty compatible with Arrow Flight SQL 19 and other
transitive Netty users. -->
+ <netty-all.version>4.2.15.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>
@@ -364,8 +363,8 @@ under the License.
<antlr4.version>4.13.1</antlr4.version>
<joda.version>2.8.1</joda.version>
<project.scm.id>github</project.scm.id>
- <spring.version>3.5.7</spring.version>
- <spring-framework.version>6.2.12</spring-framework.version>
+ <spring.version>3.5.14</spring.version>
+ <spring-framework.version>6.2.18</spring-framework.version>
<orc.version>1.8.4</orc.version>
<zookeeper.version>3.9.3</zookeeper.version>
<velocity-engine-core.version>2.4</velocity-engine-core.version>
@@ -395,8 +394,10 @@ under the License.
<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
<asm.version>9.4</asm.version>
<airlift.concurrent.version>202</airlift.concurrent.version>
- <azure.sdk.version>1.3.4</azure.sdk.version>
+ <azure.sdk.version>1.3.7</azure.sdk.version>
<azure.sdk.batch.version>12.22.0</azure.sdk.batch.version>
+ <msal4j.version>1.25.0</msal4j.version>
+ <azure.keyvault.core.version>1.2.6</azure.keyvault.core.version>
<semver4j.version>5.3.0</semver4j.version>
<aliyun-sdk-oss.version>3.15.0</aliyun-sdk-oss.version>
<!--Fixes the regression described in
https://github.com/aws/aws-sdk-java-v2/issues/5805 that forced us to downgrade
aws-s3 to version 2.29.x.-->
@@ -801,19 +802,18 @@ under the License.
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/commons-lang/commons-lang
-->
- <!-- upgrade commons-lang from 2.4 to 2.6 to fix incompatibility
of with versioning scheme of Java 9 and later -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
<!--
https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
+ <!-- Pulled in by hive-exec -> hadoop-yarn-registry and
hadoop-common. -->
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>${commons-net.version}</version>
+ </dependency>
<!--
https://mvnrepository.com/artifact/org.apache.commons/commons-math3 -->
<dependency>
<groupId>org.apache.commons</groupId>
@@ -930,6 +930,11 @@ under the License.
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-iostreams</artifactId>
@@ -1792,6 +1797,18 @@ under the License.
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!-- Pulled in by azure-identity and msal4j-persistence-extension.
-->
+ <dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>msal4j</artifactId>
+ <version>${msal4j.version}</version>
+ </dependency>
+ <!-- Pulled in by hadoop-azure -> azure-storage. -->
+ <dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>azure-keyvault-core</artifactId>
+ <version>${azure.keyvault.core.version}</version>
+ </dependency>
<!-- tencent COS -->
<dependency>
<groupId>com.qcloud</groupId>
diff --git
a/regression-test/java-udf-src/src/main/java/org/apache/doris/udf/StringTest.java
b/regression-test/java-udf-src/src/main/java/org/apache/doris/udf/StringTest.java
index 822c484c706..fc8e6803b70 100644
---
a/regression-test/java-udf-src/src/main/java/org/apache/doris/udf/StringTest.java
+++
b/regression-test/java-udf-src/src/main/java/org/apache/doris/udf/StringTest.java
@@ -17,7 +17,7 @@
package org.apache.doris.udf;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.hive.ql.exec.UDF;
public class StringTest extends UDF {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
