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 c76cc0815aa branch-3.1: [chore](dep)upgrade dependencies #57402
(#57661)
c76cc0815aa is described below
commit c76cc0815aad514448cca134805317cded639ed3
Author: Calvin Kirs <[email protected]>
AuthorDate: Tue Nov 4 14:48:59 2025 +0800
branch-3.1: [chore](dep)upgrade dependencies #57402 (#57661)
picked from #57402
---
fe/be-java-extensions/preload-extensions/pom.xml | 91 +---------------------
fe/fe-core/pom.xml | 13 ----
.../WorkloadConditionUsername.java | 2 +-
.../hadoop/hbase/io/FSDataInputStreamWrapper.java | 3 +-
fe/pom.xml | 60 ++++----------
5 files changed, 19 insertions(+), 150 deletions(-)
diff --git a/fe/be-java-extensions/preload-extensions/pom.xml
b/fe/be-java-extensions/preload-extensions/pom.xml
index 077459d816f..fc6ece7b8c4 100644
--- a/fe/be-java-extensions/preload-extensions/pom.xml
+++ b/fe/be-java-extensions/preload-extensions/pom.xml
@@ -66,16 +66,6 @@ under the License.
<version>${hadoop.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.hudi</groupId>
- <artifactId>hudi-spark-client</artifactId>
- <version>${hudi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hudi</groupId>
- <artifactId>hudi-spark-common_${scala.binary.version}</artifactId>
- <version>${hudi.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
@@ -91,82 +81,6 @@ under the License.
<artifactId>antlr4-runtime</artifactId>
<version>${antlr4.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.hudi</groupId>
- <artifactId>hudi-spark3-common</artifactId>
- <version>${hudi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hudi</groupId>
-
<artifactId>${hudi-spark.version}_${scala.binary.version}</artifactId>
- <version>${hudi.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>json4s-ast_2.11</artifactId>
- <groupId>org.json4s</groupId>
- </exclusion>
- <exclusion>
- <artifactId>json4s-core_2.11</artifactId>
- <groupId>org.json4s</groupId>
- </exclusion>
- <exclusion>
- <artifactId>json4s-jackson_2.11</artifactId>
- <groupId>org.json4s</groupId>
- </exclusion>
- <exclusion>
- <artifactId>json4s-scalap_2.11</artifactId>
- <groupId>org.json4s</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-core_${scala.binary.version}</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>jackson-module-scala_2.12</artifactId>
- <groupId>com.fasterxml.jackson.module</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hadoop-client-api</artifactId>
- <groupId>org.apache.hadoop</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hadoop-client-runtime</artifactId>
- <groupId>org.apache.hadoop</groupId>
- </exclusion>
- </exclusions>
- <version>${spark.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-sql_${scala.binary.version}</artifactId>
- <version>${spark.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>hadoop-client-api</artifactId>
- <groupId>org.apache.hadoop</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-launcher_${scala.binary.version}</artifactId>
- <version>${spark.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-catalyst_${scala.binary.version}</artifactId>
- <version>${spark.version}</version>
- <scope>compile</scope>
- </dependency>
<dependency>
<!-- version of spark's jackson module is error -->
<groupId>com.fasterxml.jackson.module</groupId>
@@ -200,7 +114,10 @@ under the License.
<artifactId>paimon-s3</artifactId>
<version>${paimon.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-oss</artifactId>
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index cebaa1621f2..69024ddc369 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -305,10 +305,6 @@ under the License.
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- </dependency>
<!-- https://mvnrepository.com/artifact/com.github.oshi/oshi-core -->
<dependency>
<groupId>com.github.oshi</groupId>
@@ -868,15 +864,6 @@ under the License.
<artifactId>ap-loader-all</artifactId>
<version>3.0-8</version>
</dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-hadoop-compat</artifactId>
- <version>2.5.2-hadoop3</version>
- </dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadConditionUsername.java
b/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadConditionUsername.java
index 8b7dfacdc7d..90431a0141b 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadConditionUsername.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadConditionUsername.java
@@ -17,7 +17,7 @@
package org.apache.doris.resource.workloadschedpolicy;
-import org.apache.hbase.thirdparty.com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.SerializedName;
public class WorkloadConditionUsername implements WorkloadCondition {
diff --git
a/fe/fe-core/src/main/java/org/apache/hadoop/hbase/io/FSDataInputStreamWrapper.java
b/fe/fe-core/src/main/java/org/apache/hadoop/hbase/io/FSDataInputStreamWrapper.java
index b0624fc6ea0..7a68c562631 100644
---
a/fe/fe-core/src/main/java/org/apache/hadoop/hbase/io/FSDataInputStreamWrapper.java
+++
b/fe/fe-core/src/main/java/org/apache/hadoop/hbase/io/FSDataInputStreamWrapper.java
@@ -42,6 +42,7 @@ import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.util.concurrent.atomic.AtomicInteger;
+import com.google.common.io.Closeables;
import org.apache.hadoop.fs.CanUnbuffer;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileSystem;
@@ -52,8 +53,6 @@ import org.apache.yetus.audience.InterfaceAudience;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.hbase.thirdparty.com.google.common.io.Closeables;
-
/**
* Wrapper for input stream(s) that takes care of the interaction of FS and
HBase checksums,
* as well as closing streams. Initialization is not thread-safe, but normal
operation is;
diff --git a/fe/pom.xml b/fe/pom.xml
index 002955b8394..23e3e9dc18c 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -223,8 +223,8 @@ under the License.
<properties>
<doris.hive.catalog.shade.version>3.0.1</doris.hive.catalog.shade.version>
<!-- iceberg 1.9.1 depends avro on 1.12 -->
- <avro.version>1.12.0</avro.version>
- <parquet.version>1.15.2</parquet.version>
+ <avro.version>1.12.1</avro.version>
+ <parquet.version>1.16.0</parquet.version>
<spark.version>3.4.3</spark.version>
<hudi.version>1.0.2</hudi.version>
<obs.dependency.scope>compile</obs.dependency.scope>
@@ -242,18 +242,18 @@ under the License.
<skip.plugin>false</skip.plugin>
<sonar.organization>apache</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
- <aspectj.version>1.9.7</aspectj.version>
<cglib.version>2.2</cglib.version>
<commons-cli.version>1.4</commons-cli.version>
- <commons-filerupload.version>1.5</commons-filerupload.version>
+ <aspectj.version>1.9.7</aspectj.version>
+ <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-beanutils.version>1.11.0</commons-beanutils.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.17.0</commons-lang3.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>
+ <commons-math3.version>3.6.1</commons-math3.version>
<commons-validator.version>1.9.0</commons-validator.version>
<gson.version>2.10.1</gson.version>
<guava.version>33.2.1-jre</guava.version>
@@ -265,6 +265,7 @@ under the License.
<jflex.version>1.4.3</jflex.version>
<jmockit.version>1.49</jmockit.version>
<commons-io.version>2.18.0</commons-io.version>
+ <commons-beanutils.version>1.11.0</commons-beanutils.version>
<json-simple.version>1.1.1</json-simple.version>
<junit.version>5.8.2</junit.version>
<hikaricp.version>6.0.0</hikaricp.version>
@@ -362,7 +363,7 @@ under the License.
<kerby.version>2.0.3</kerby.version>
<jettison.version>1.5.4</jettison.version>
<jetty.version>9.4.57.v20241219</jetty.version>
- <immutables.version>2.9.3</immutables.version>
+ <immutables.version>2.9.3</immutables.version>
<ivy.version>2.5.2</ivy.version>
<icu4j.version>75.1</icu4j.version>
<ini4j.version>0.5.4</ini4j.version>
@@ -686,47 +687,6 @@ under the License.
<artifactId>kerb-simplekdc</artifactId>
<version>${kerby.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- <version>${hbase.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-hadoop2-compat</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>hbase-shaded-miscellaneous</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-protocol-shaded</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core4</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>hbase-shaded-gson</artifactId>
- <version>${hbase-shaded-gson.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.kerby</groupId>
<artifactId>kerb-core</artifactId>
@@ -803,6 +763,12 @@ under the License.
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
+ <!--
https://mvnrepository.com/artifact/org.apache.commons/commons-math3 -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>${commons-math3.version}</version>
+ </dependency>
<!--
https://mvnrepository.com/artifact/org.apache.commons/commons-pool2 -->
<dependency>
<groupId>org.apache.commons</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
