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 699891d89a optimize: upgrade alibaba/druid version  to 1.2.20 (#6523)
699891d89a is described below

commit 699891d89a4496eb52298b576f13bb53fb0fef96
Author: 墨小溪 <[email protected]>
AuthorDate: Wed Jun 26 18:13:43 2024 +0800

    optimize: upgrade alibaba/druid version  to 1.2.20 (#6523)
---
 changes/en-us/2.x.md | 5 ++---
 changes/zh-cn/2.x.md | 4 +++-
 compatible/pom.xml   | 2 +-
 dependencies/pom.xml | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 78e5444629..54c2a2c6eb 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -16,6 +16,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6499](https://github.com/apache/incubator-seata/pull/6499)] split the 
task thread pool for committing and rollbacking statuses
 - [[#6208](https://github.com/apache/incubator-seata/pull/6208)] optimize : 
load SeataSerializer by version
 - [[#6209](https://github.com/apache/incubator-seata/pull/6209)] Eliminate 
RpcMessage and Encoder/Decoder dependencies
+- [[#6523](https://github.com/apache/incubator-seata/pull/6523)] upgrade 
alibaba/druid version to 1.2.20
 
 ### refactor:
 - [[#6534](https://github.com/apache/incubator-seata/pull/6534)] optimize: 
send async response
@@ -26,9 +27,6 @@ Add changes here for all PR submitted to the 2.x branch.
 ### test:
 
 
-### refactor:
-
-
 Thanks to these contributors for their code commits. Please report an 
unintended omission.
 
 <!-- Please make sure your Github ID is in the list below -->
@@ -36,6 +34,7 @@ Thanks to these contributors for their code commits. Please 
report an unintended
 - [tuwenlin](https://github.com/tuwenlin)
 - [YeonCheolGit](https://github.com/YeonCheolGit)
 - [liuqiufeng](https://github.com/liuqiufeng)
+- [God-Gan](https://github.com/God-Gan)
 - [Bughue](https://github.com/Bughue)
 - [tanyaofei](https://github.com/tanyaofei)
 
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index b3b603a507..3f59e14835 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -15,6 +15,7 @@
 - [[#6499](https://github.com/apache/incubator-seata/pull/6499)] 拆分 committing 
和 rollbacking 状态的任务线程池
 - [[#6208](https://github.com/apache/incubator-seata/pull/6208)] 支持多版本的Seata序列化
 - [[#6209](https://github.com/apache/incubator-seata/pull/6209)] 解开 RpcMessage 
和 Encoder/Decoder 的互相依赖
+- [[#6523](https://github.com/apache/incubator-seata/pull/6523)] 升级 
alibaba/druid 的版本到1.2.20
 
 ### refactor:
 - [[#6534](https://github.com/apache/incubator-seata/pull/6534)] 优化: 发送异步响应
@@ -23,7 +24,6 @@
 
 ### test:
 
-### refactor:
 
 非常感谢以下 contributors 的代码贡献。若有无意遗漏,请报告。
 
@@ -32,7 +32,9 @@
 - [tuwenlin](https://github.com/tuwenlin)
 - [YeonCheolGit](https://github.com/YeonCheolGit)
 - [liuqiufeng](https://github.com/liuqiufeng)
+- [God-Gan](https://github.com/God-Gan)
 - [Bughue](https://github.com/Bughue)
 - [tanyaofei](https://github.com/tanyaofei)
 
+
 同时,我们收到了社区反馈的很多有价值的issue和建议,非常感谢大家。
diff --git a/compatible/pom.xml b/compatible/pom.xml
index c1f19f9e40..765196af88 100644
--- a/compatible/pom.xml
+++ b/compatible/pom.xml
@@ -33,7 +33,7 @@
     <description>compatible with io.seata API</description>
     <properties>
         <mockito.version>4.11.0</mockito.version>
-        <druid.version>1.2.7</druid.version>
+        <druid.version>1.2.20</druid.version>
         <mysql.version>5.1.42</mysql.version>
         <mariadb.version>2.7.2</mariadb.version>
         <assertj-core.version>3.12.2</assertj-core.version>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 50d0bc19b1..717ad14019 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -108,7 +108,7 @@
         <h2.version>1.4.181</h2.version>
         <mariadb.version>2.7.2</mariadb.version>
         <!-- db connection pool -->
-        <druid.version>1.2.7</druid.version>
+        <druid.version>1.2.20</druid.version>
         <commons-dbcp2.version>2.9.0</commons-dbcp2.version>
         <hikari.version>3.4.3</hikari.version>
         <!-- sql parser -->


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to