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 0605fa8d3d bugfix: mvn spotless:apply failed (#7644)
0605fa8d3d is described below
commit 0605fa8d3d97e8599b00b567e194faf161312736
Author: Jongmin Chung <[email protected]>
AuthorDate: Sat Oct 4 22:03:38 2025 +0900
bugfix: mvn spotless:apply failed (#7644)
---
changes/en-us/2.x.md | 3 +++
changes/zh-cn/2.x.md | 2 ++
pom.xml | 30 ++++------------------
.../apache/seata/tm/api/TransactionalTemplate.java | 2 +-
4 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index bb5daaa145..6739767f2e 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -40,10 +40,12 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7596](https://github.com/apache/incubator-seata/pull/7596)] Fixed the
issue where deserialization failed when the xss filter obtained the default
keyword
- [[#7613](https://github.com/apache/incubator-seata/pull/7613)] Fixed the SQL
error in the datetime format time query in the global lock query
- [[#7624](https://github.com/apache/incubator-seata/pull/7624)] fix the
compatibility issue of yml configuration files
+- [[#7644](https://github.com/apache/incubator-seata/pull/7644)] fix the
compatibility issue of spotless when java 25
- [[#7662](https://github.com/apache/incubator-seata/pull/7662)] ensure
visibility of rm and The methods in MockTest are executed in order
### optimize:
+
- [[#7460](https://github.com/apache/incubator-seata/pull/7460)] Remove
hardcoded port configuration in core module test classes
- [[#7478](https://github.com/apache/incubator-seata/pull/7484)] optimize:
remove client id metric
- [[#7557](https://github.com/seata/seata/pull/7557)] upgrade some npmjs
dependencies
@@ -106,6 +108,7 @@ Thanks to these contributors for their code commits. Please
report an unintended
- [unifolio0](https://github.com/unifolio0)
- [Asuka-star](https://github.com/Asuka-star)
- [YoWuwuuuw](https://github.com/YoWuwuuuw)
+- [jongmin-chung](https://github.com/jongmin-chung)
- [jihun4452](https://github.com/jihun4452)
- [psxjoy](https://github.com/psxjoy)
- [dsomehan](https://github.com/dsomehan)
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 9051474a3c..f80ffb4bd8 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -41,6 +41,7 @@
- [[#7596](https://github.com/apache/incubator-seata/pull/7596)]
修复xss过滤器获取默认关键字时反序列化失败的问题
- [[#7613](https://github.com/apache/incubator-seata/pull/7613)]
修复全局锁查询中的datetime时间格式时间查询sql错误
- [[#7624](https://github.com/apache/incubator-seata/pull/7624)]
修复yml配置文件中对于整数的兼容问题
+- [[#7644](https://github.com/apache/incubator-seata/pull/7644)]
修复JAVA25时spotless的兼容性问题
- [[#7662](https://github.com/apache/incubator-seata/pull/7662)] 确保 rm 的可见性，并且
MockTest 中的方法按顺序执行
@@ -108,6 +109,7 @@
- [unifolio0](https://github.com/unifolio0)
- [Asuka-star](https://github.com/Asuka-star)
- [YoWuwuuuw](https://github.com/YoWuwuuuw)
+- [jongmin-chung](https://github.com/jongmin-chung)
- [jihun4452](https://github.com/jihun4452)
- [psxjoy](https://github.com/psxjoy)
- [dsomehan](https://github.com/dsomehan)
diff --git a/pom.xml b/pom.xml
index 9092d42950..53df9f80ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,38 +234,18 @@
</profile>
<!-- profile: spotless -->
<profile>
- <id>jdk9-jdk11-spotless</id>
+ <id>jdk17-spotless</id>
<activation>
- <jdk>[1.8, 11)</jdk>
+ <jdk>[17,)</jdk>
</activation>
<properties>
- <palantirJavaFormat.version>1.1.0</palantirJavaFormat.version>
- </properties>
- </profile>
-
- <profile>
- <id>jdk11-jdk21-spotless</id>
- <activation>
- <jdk>[11, 21)</jdk>
- </activation>
- <properties>
- <palantirJavaFormat.version>2.28.0</palantirJavaFormat.version>
- </properties>
- </profile>
-
- <profile>
- <id>jdk21-spotless</id>
- <activation>
- <jdk>[21,)</jdk>
- </activation>
- <properties>
- <palantirJavaFormat.version>2.39.0</palantirJavaFormat.version>
+ <palantirJavaFormat.version>2.74.0</palantirJavaFormat.version>
</properties>
</profile>
<profile>
- <id>java11+</id>
+ <id>java17+</id>
<activation>
- <jdk>[11,)</jdk>
+ <jdk>[17,)</jdk>
</activation>
<build>
<plugins>
diff --git
a/tm/src/main/java/org/apache/seata/tm/api/TransactionalTemplate.java
b/tm/src/main/java/org/apache/seata/tm/api/TransactionalTemplate.java
index de293ccd24..7d78b2c9e6 100644
--- a/tm/src/main/java/org/apache/seata/tm/api/TransactionalTemplate.java
+++ b/tm/src/main/java/org/apache/seata/tm/api/TransactionalTemplate.java
@@ -419,7 +419,7 @@ public class TransactionalTemplate {
break;
case TimeoutRollbacked:
case Rollbacked:
- // rollback transactions but do not exist are usually
considered completed
+ // rollback transactions but do not exist are usually considered
completed
case Finished:
code = TransactionalExecutor.Code.RollbackDone;
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
