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 9295e5e6a2d branch-3.1: [chore](dep)upgrade protobuf #57784 (#57802)
9295e5e6a2d is described below
commit 9295e5e6a2d04ae83f15f232198a312f6dceb59b
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Nov 7 16:53:10 2025 +0800
branch-3.1: [chore](dep)upgrade protobuf #57784 (#57802)
Cherry-picked from #57784
Co-authored-by: Calvin Kirs <[email protected]>
---
fe/be-java-extensions/hadoop-deps/pom.xml | 2 +-
fe/pom.xml | 18 ++++++++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/fe/be-java-extensions/hadoop-deps/pom.xml
b/fe/be-java-extensions/hadoop-deps/pom.xml
index 4829b5a3273..9bfffa56aa0 100644
--- a/fe/be-java-extensions/hadoop-deps/pom.xml
+++ b/fe/be-java-extensions/hadoop-deps/pom.xml
@@ -57,7 +57,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>hadoop-shaded-protobuf_3_7</artifactId>
+ <artifactId>hadoop-shaded-protobuf_3_25</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/fe/pom.xml b/fe/pom.xml
index 10fe96b183c..8d502d42698 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -289,7 +289,7 @@ under the License.
<!--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.43.0</check.freamework.version>
- <protobuf.version>3.24.3</protobuf.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 -->
<protoc.artifact.version>3.24.3</protoc.artifact.version>
@@ -346,7 +346,7 @@ under the License.
<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>
+
<hadoop.thirdparty.protobuf_3_25.version>1.5.0</hadoop.thirdparty.protobuf_3_25.version>
<hbase.version>2.4.9</hbase.version>
<hbase-shaded-gson.version>4.1.7</hbase-shaded-gson.version>
<antlr4.version>4.13.1</antlr4.version>
@@ -365,7 +365,7 @@ under the License.
<jetty.version>9.4.57.v20241219</jetty.version>
<immutables.version>2.9.3</immutables.version>
<ivy.version>2.5.2</ivy.version>
- <icu4j.version>75.1</icu4j.version>
+ <icu4j.version>78.1</icu4j.version>
<ini4j.version>0.5.4</ini4j.version>
<!--todo waiting release-->
<quartz.version>2.3.2</quartz.version>
@@ -384,7 +384,7 @@ 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.2.36</azure.sdk.version>
+ <azure.sdk.version>1.3.2</azure.sdk.version>
<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>
@@ -482,6 +482,12 @@ under the License.
<artifactId>javax.el</artifactId>
<scope>provided</scope>
</dependency>
+ <!--not allowed to use jackson 1.x in fe module-->
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>io.airlift</groupId>
@@ -666,8 +672,8 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>hadoop-shaded-protobuf_3_7</artifactId>
- <version>${hadoop.thirdparty.protobuf_3_7.version}</version>
+ <artifactId>hadoop-shaded-protobuf_3_25</artifactId>
+ <version>${hadoop.thirdparty.protobuf_3_25.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
