This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new a75a21eaed optimize: add OkHttp and MockWebServer dependencies to
resolve version confilcts (#7934)
a75a21eaed is described below
commit a75a21eaed1adeb7306d5d5553460c10e8542bc9
Author: Kang Minseok <[email protected]>
AuthorDate: Fri Jan 16 10:42:30 2026 +0900
optimize: add OkHttp and MockWebServer dependencies to resolve version
confilcts (#7934)
---
changes/en-us/2.x.md | 2 ++
changes/zh-cn/2.x.md | 2 ++
dependencies/pom.xml | 16 ++++++++++++++--
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 369233c2b9..980b4d2a25 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -32,6 +32,7 @@ Add changes here for all PR submitted to the 2.x branch.
### optimize:
- [[#7930](https://github.com/apache/incubator-seata/pull/7930)] pin the
Spring version for namingserver and console
+- [[#7934](https://github.com/apache/incubator-seata/pull/7934)] add OkHttp
and MockWebServer dependencies to resolve version conflicts
### security:
@@ -54,6 +55,7 @@ Thanks to these contributors for their code commits. Please
report an unintended
- [LegendPei](https://github.com/LegendPei)
- [funky-eyes](https://github.com/funky-eyes)
- [maple525866](https://github.com/maple525866)
+- [neronsoda](https://github.com/neronsoda)
Also, we receive many valuable issues, questions and advices from our
community. Thanks for you all.
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 1c9e423e9c..fcd6eed0e7 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -32,6 +32,7 @@
### optimize:
- [[#7930](https://github.com/apache/incubator-seata/pull/7930)]
固定namingserver和console的Spring版本
+- [[#7934](https://github.com/apache/incubator-seata/pull/7934)] 添加 OkHttp 和
MockWebServer 依赖来解决版本冲突
### security:
@@ -55,6 +56,7 @@
- [LegendPei](https://github.com/LegendPei)
- [funky-eyes](https://github.com/funky-eyes)
- [maple525866](https://github.com/maple525866)
+- [neronsoda](https://github.com/neronsoda)
同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 09f8d431ee..a7a7701528 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -145,6 +145,8 @@
<!-- for fory -->
<fory.version>0.12.3</fory.version>
+
+ <okhttp.version>4.9.3</okhttp.version>
</properties>
<dependencyManagement>
@@ -904,8 +906,8 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
@@ -930,6 +932,16 @@
<artifactId>oscarJDBC8</artifactId>
<version>${oscar.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>${okhttp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>mockwebserver</artifactId>
+ <version>${mockwebserver-version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
