Skip to content

Commit 0605fa8

Browse files
bugfix: mvn spotless:apply failed (#7644)
1 parent b6af418 commit 0605fa8

File tree

4 files changed

+11
-26
lines changed

4 files changed

+11
-26
lines changed

changes/en-us/2.x.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,12 @@ Add changes here for all PR submitted to the 2.x branch.
4040
- [[#7596](https://github.com/apache/incubator-seata/pull/7596)] Fixed the issue where deserialization failed when the xss filter obtained the default keyword
4141
- [[#7613](https://github.com/apache/incubator-seata/pull/7613)] Fixed the SQL error in the datetime format time query in the global lock query
4242
- [[#7624](https://github.com/apache/incubator-seata/pull/7624)] fix the compatibility issue of yml configuration files
43+
- [[#7644](https://github.com/apache/incubator-seata/pull/7644)] fix the compatibility issue of spotless when java 25
4344
- [[#7662](https://github.com/apache/incubator-seata/pull/7662)] ensure visibility of rm and The methods in MockTest are executed in order
4445

4546

4647
### optimize:
48+
4749
- [[#7460](https://github.com/apache/incubator-seata/pull/7460)] Remove hardcoded port configuration in core module test classes
4850
- [[#7478](https://github.com/apache/incubator-seata/pull/7484)] optimize: remove client id metric
4951
- [[#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
106108
- [unifolio0](https://github.com/unifolio0)
107109
- [Asuka-star](https://github.com/Asuka-star)
108110
- [YoWuwuuuw](https://github.com/YoWuwuuuw)
111+
- [jongmin-chung](https://github.com/jongmin-chung)
109112
- [jihun4452](https://github.com/jihun4452)
110113
- [psxjoy](https://github.com/psxjoy)
111114
- [dsomehan](https://github.com/dsomehan)

changes/zh-cn/2.x.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
- [[#7596](https://github.com/apache/incubator-seata/pull/7596)] 修复xss过滤器获取默认关键字时反序列化失败的问题
4242
- [[#7613](https://github.com/apache/incubator-seata/pull/7613)] 修复全局锁查询中的datetime时间格式时间查询sql错误
4343
- [[#7624](https://github.com/apache/incubator-seata/pull/7624)] 修复yml配置文件中对于整数的兼容问题
44+
- [[#7644](https://github.com/apache/incubator-seata/pull/7644)] 修复JAVA25时spotless的兼容性问题
4445
- [[#7662](https://github.com/apache/incubator-seata/pull/7662)] 确保 rm 的可见性,并且 MockTest 中的方法按顺序执行
4546

4647

@@ -108,6 +109,7 @@
108109
- [unifolio0](https://github.com/unifolio0)
109110
- [Asuka-star](https://github.com/Asuka-star)
110111
- [YoWuwuuuw](https://github.com/YoWuwuuuw)
112+
- [jongmin-chung](https://github.com/jongmin-chung)
111113
- [jihun4452](https://github.com/jihun4452)
112114
- [psxjoy](https://github.com/psxjoy)
113115
- [dsomehan](https://github.com/dsomehan)

pom.xml

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -234,38 +234,18 @@
234234
</profile>
235235
<!-- profile: spotless -->
236236
<profile>
237-
<id>jdk9-jdk11-spotless</id>
237+
<id>jdk17-spotless</id>
238238
<activation>
239-
<jdk>[1.8, 11)</jdk>
239+
<jdk>[17,)</jdk>
240240
</activation>
241241
<properties>
242-
<palantirJavaFormat.version>1.1.0</palantirJavaFormat.version>
243-
</properties>
244-
</profile>
245-
246-
<profile>
247-
<id>jdk11-jdk21-spotless</id>
248-
<activation>
249-
<jdk>[11, 21)</jdk>
250-
</activation>
251-
<properties>
252-
<palantirJavaFormat.version>2.28.0</palantirJavaFormat.version>
253-
</properties>
254-
</profile>
255-
256-
<profile>
257-
<id>jdk21-spotless</id>
258-
<activation>
259-
<jdk>[21,)</jdk>
260-
</activation>
261-
<properties>
262-
<palantirJavaFormat.version>2.39.0</palantirJavaFormat.version>
242+
<palantirJavaFormat.version>2.74.0</palantirJavaFormat.version>
263243
</properties>
264244
</profile>
265245
<profile>
266-
<id>java11+</id>
246+
<id>java17+</id>
267247
<activation>
268-
<jdk>[11,)</jdk>
248+
<jdk>[17,)</jdk>
269249
</activation>
270250
<build>
271251
<plugins>

tm/src/main/java/org/apache/seata/tm/api/TransactionalTemplate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ private void rollbackTransaction(GlobalTransaction tx, Throwable originalExcepti
419419
break;
420420
case TimeoutRollbacked:
421421
case Rollbacked:
422-
// rollback transactions but do not exist are usually considered completed
422+
// rollback transactions but do not exist are usually considered completed
423423
case Finished:
424424
code = TransactionalExecutor.Code.RollbackDone;
425425
break;

0 commit comments

Comments
 (0)