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
commit 07daf38b8ca9cae57087e7cbb791a986aa7c8a82
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Mar 17 09:08:27 2026 +0800
branch-4.0: [chore](fe) upgrade okhttp to 5.3.2 #61263 (#61370)
Cherry-picked from #61263
Co-authored-by: Calvin Kirs <[email protected]>
---
fe/fe-core/pom.xml | 22 +++++++++++++++++++++-
fe/pom.xml | 28 ++++++++++++++++++----------
2 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 8c3bd0e6685..749343410c6 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -349,11 +349,31 @@ under the License.
<dependency>
<groupId>com.tencentcloudapi</groupId>
<artifactId>tencentcloud-sdk-java-sts</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- huawei cloud sts -->
<dependency>
<groupId>com.huaweicloud.sdk</groupId>
<artifactId>huaweicloud-sdk-iam</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- ICU4J for unicode normalization -->
<dependency>
@@ -605,7 +625,7 @@ under the License.
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
+ <artifactId>okhttp-jvm</artifactId>
</dependency>
<dependency>
diff --git a/fe/pom.xml b/fe/pom.xml
index 6c3cfe4773d..d85576e246a 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -305,9 +305,7 @@ under the License.
<generex.version>1.0.1</generex.version>
<jetty-servlet.version>11.0.26</jetty-servlet.version>
<jetty-websocket.version>9.4.58.v20250814</jetty-websocket.version>
- <logging-interceptor.version>4.12.0</logging-interceptor.version>
- <okhttp.version>4.9.3</okhttp.version>
- <okio.version>3.4.0</okio.version>
+ <okhttp.version>5.3.2</okhttp.version>
<snakeyaml.version>2.0</snakeyaml.version>
<validation-api.version>2.0.1.Final</validation-api.version>
<zjsonpatch.version>0.2.3</zjsonpatch.version>
@@ -1096,15 +1094,9 @@ under the License.
<!--
https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
+ <artifactId>okhttp-jvm</artifactId>
<version>${okhttp.version}</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/com.squareup.okio/okio -->
- <dependency>
- <groupId>com.squareup.okio</groupId>
- <artifactId>okio</artifactId>
- <version>${okio.version}</version>
- </dependency>
<!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
<dependency>
<groupId>org.yaml</groupId>
@@ -1338,6 +1330,14 @@ under the License.
<groupId>org.ini4j</groupId>
<artifactId>ini4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- For Iceberg, must be consistent with Iceberg version -->
@@ -1709,6 +1709,14 @@ under the License.
<artifactId>re2j</artifactId>
<groupId>io.trino</groupId>
</exclusion>
+ <exclusion>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
