This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new f98848db781 [chore](fe) upgrade okhttp to 5.3.2 (#61263)
f98848db781 is described below
commit f98848db781e954221a91192127e7adcec3e9c14
Author: Calvin Kirs <[email protected]>
AuthorDate: Mon Mar 16 13:59:00 2026 +0800
[chore](fe) upgrade okhttp to 5.3.2 (#61263)
This change excludes transitive `com.squareup.okhttp3:okhttp` and
`com.squareup.okio:okio`
from dependencies such as `tencentcloud-sdk-java-sts`, `trino-main`, and
`odps-sdk-core`.
This does not remove OkHttp support from FE modules.
Instead, FE now declares an explicit direct dependency on:
- `com.squareup.okhttp3:okhttp-jvm:${okhttp.version}`
- transitive `com.squareup.okio:okio-jvm`
This keeps the runtime classes required by those SDKs (`okhttp3.*` /
`okio.*`) available,
while avoiding multiple incompatible OkHttp/Okio versions on the
classpath.
In other words, this PR replaces transitive OkHttp/Okio with a single
centrally managed version,
rather than removing them entirely.
---
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 12350dcc131..91f1c413476 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -380,11 +380,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>
@@ -636,7 +656,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 db6deaf5f3f..336d7592773 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -337,9 +337,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>
@@ -1134,15 +1132,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>
@@ -1376,6 +1368,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>
<dependency>
@@ -1748,6 +1748,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]
