Skip to content

branch-4.0: [chore](dep)upgrade dependencies(#62858, #64196, #64208) #65065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CalvinKirs wants to merge 3 commits into
base: branch-4.0
Choose a base branch
from
+48 −27
Open

branch-4.0: [chore](dep)upgrade dependencies(#62858, #64196, #64208) #65065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f759c1
[fix](fe) address dependency check findings (#62858)
CalvinKirs Apr 29, 2026
903ff04
[chore](deps) remove unused commons-lang (2.x) from fe (#64196)
CalvinKirs Jun 9, 2026
49f91da
[chore](dep)Upgrade dependencies (#64208)
CalvinKirs Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions fe/be-java-extensions/java-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions fe/be-java-extensions/preload-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
14 changes: 14 additions & 0 deletions fe/hive-udf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
49 changes: 33 additions & 16 deletions fe/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,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>
Expand All @@ -277,14 +277,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.132.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>
Expand Down Expand Up @@ -361,8 +360,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.13</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>
Expand Down Expand Up @@ -392,8 +391,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.-->
Expand Down Expand Up @@ -792,19 +793,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>
Expand Down Expand Up @@ -916,6 +916,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>
Expand Down Expand Up @@ -1772,6 +1777,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>
Expand Down
2 changes: 1 addition & 1 deletion regression-test/java-udf-src/src/main/java/org/apache/doris/udf/StringTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading