This is an automated email from the ASF dual-hosted git repository.
slievrly 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 0b67ab3285 optimize: migrate org.codehaus.groovy to org.apache.groovy
(#8083)
0b67ab3285 is described below
commit 0b67ab3285480880879e4160d9d658770cbf842a
Author: 徐晓伟 <[email protected]>
AuthorDate: Wed May 27 12:43:16 2026 +0800
optimize: migrate org.codehaus.groovy to org.apache.groovy (#8083)
---
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 1 +
dependencies/pom.xml | 5 +++--
saga/pom.xml | 3 ++-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index ad2d78e51a..26ab33c379 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -72,6 +72,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#8069](https://github.com/apache/incubator-seata/pull/8069)] bump
org.assertj:assertj-core from 3.12.2 to 3.27.7
- [[#8075](https://github.com/apache/incubator-seata/pull/8075)] bump
at.yawk.lz4:lz4-java from 1.9.0 to 1.10.1
- [[#8077](https://github.com/apache/incubator-seata/pull/8077)] removed the
OkHttp3 dependency from the NamingServer
+- [[#8083](https://github.com/apache/incubator-seata/pull/8083)] migrate
org.codehaus.groovy to org.apache.groovy
- [[#8080](https://github.com/apache/incubator-seata/pull/8080)] bump
org.postgresql:postgresql from 42.3.8 to 42.3.10
- [[#8092](https://github.com/apache/incubator-seata/pull/8092)] add
checkstyle rules to enforce ThreadPoolExecutorFactory usage
- [[#8097](https://github.com/apache/incubator-seata/pull/8097)] bump
com.alibaba.nacos:nacos-client from 1.4.6 to 2.0.4
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index f853ce9c73..63b6a88ef8 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -72,6 +72,7 @@
- [[#8069](https://github.com/apache/incubator-seata/pull/8069)] 将
org.assertj:assertj-core 从 3.12.2 版本升级到 3.27.7
- [[#8075](https://github.com/apache/incubator-seata/pull/8075)] 将
at.yawk.lz4:lz4-java 从 1.9.0 版本升级到 1.10.1
- [[#8077](https://github.com/apache/incubator-seata/pull/8077)] namingserver
移除 okhttp3 依赖
+- [[#8083](https://github.com/apache/incubator-seata/pull/8083)] 将
org.codehaus.groovy 迁移到 org.apache.groovy
- [[#8080](https://github.com/apache/incubator-seata/pull/8080)] 将
org.postgresql:postgresql 从 42.3.8 版本升级到 42.3.10
- [[#8086](https://github.com/apache/incubator-seata/pull/8086)]
修改consoleRemotingFilter优先级
- [[#8092](https://github.com/apache/incubator-seata/pull/8092)] 添加 checkstyle
规则以强制使用 ThreadPoolExecutorFactory
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 1a36190a3d..9cdb9d2d38 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -84,7 +84,7 @@
<kryo-serializers.version>0.45</kryo-serializers.version>
<hessian.version>4.0.63</hessian.version>
<fastjson2.version>2.0.52</fastjson2.version>
- <groovy.version>2.4.4</groovy.version>
+ <groovy.version>4.0.31</groovy.version>
<zstd.version>1.5.0-4</zstd.version>
<jackson.version>2.18.3</jackson.version>
<jackson3.version>3.1.1</jackson3.version>
@@ -767,9 +767,10 @@
<version>${kotlin-coroutines.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
+ <type>pom</type>
<exclusions>
<exclusion>
<groupId>org.junit.jupiter</groupId>
diff --git a/saga/pom.xml b/saga/pom.xml
index 7d10c03591..a5919647bf 100644
--- a/saga/pom.xml
+++ b/saga/pom.xml
@@ -67,8 +67,9 @@
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-all</artifactId>
+ <type>pom</type>
</dependency>
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
