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 77331be3e6 feature: add Java 25 support in CI configuration files
(#7663)
77331be3e6 is described below
commit 77331be3e623b2a24750cc76d48828eb2cb2e6ef
Author: funkye <[email protected]>
AuthorDate: Mon Oct 6 14:08:24 2025 +0800
feature: add Java 25 support in CI configuration files (#7663)
---
.github/workflows/build.yml | 2 +-
.github/workflows/publish-docker.yml | 2 +-
.github/workflows/test-ubuntu.yml | 4 +-
.github/workflows/test.yml | 2 +-
build/pom.xml | 2 +-
changes/en-us/2.x.md | 2 +
changes/zh-cn/2.x.md | 1 +
.../GlobalReportRequestConvertorTest.java | 44 ++++++++++++++++++++++
.../GlobalReportResponseConvertorTest.java | 43 +++++++++++++++++++++
9 files changed, 96 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 184d8b4a9c..8897d61146 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- java: [ 8, 17, 21 ]
+ java: [ 8, 17, 21, 25 ]
steps:
# step 1
- name: "Checkout"
diff --git a/.github/workflows/publish-docker.yml
b/.github/workflows/publish-docker.yml
index 5ae39f61f5..62acbb7248 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -33,7 +33,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- java: [ 8, 17, 21 ]
+ java: [ 8, 17, 21, 25 ]
steps:
# step 1
- name: "Checkout"
diff --git a/.github/workflows/test-ubuntu.yml
b/.github/workflows/test-ubuntu.yml
index 41c04659c1..3a61284ded 100644
--- a/.github/workflows/test-ubuntu.yml
+++ b/.github/workflows/test-ubuntu.yml
@@ -42,7 +42,7 @@ jobs:
max-parallel: 3
fail-fast: false
matrix:
- java: [ 8, 11, 17, 21 ]
+ java: [ 8, 11, 17, 21, 25 ]
os: [
ubuntu-24.04,
]
@@ -99,7 +99,7 @@ jobs:
max-parallel: 3
fail-fast: false
matrix:
- java: [ 17, 21 ]
+ java: [ 17, 21, 25 ]
os: [
ubuntu-24.04,
]
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 59780b0ee0..295add3927 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -88,7 +88,7 @@ jobs:
max-parallel: 3
fail-fast: false
matrix:
- java: [ 17, 21 ]
+ java: [ 17, 21, 25 ]
os: [
macos-14,
windows-2022, # Skip tests, because too many errors in unit-test.
diff --git a/build/pom.xml b/build/pom.xml
index 013a4f3b72..6d505e3555 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -101,7 +101,7 @@
<!-- Compiler -->
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
- <kotlin-maven-plugin.version>1.9.21</kotlin-maven-plugin.version>
+ <kotlin-maven-plugin.version>2.2.20</kotlin-maven-plugin.version>
<!-- Check -->
<maven-pmd-plugin.version>3.8</maven-pmd-plugin.version>
<p3c-pmd.version>1.3.6</p3c-pmd.version>
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 6739767f2e..63aaa16183 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -27,6 +27,8 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7559](https://github.com/apache/incubator-seata/pull/7559)] Introduce
Cleanup API for TableMetaRefreshHolder Instance
- [[#7669](https://github.com/apache/incubator-seata/pull/7669)] add support
for Jackson serialization and deserialization of PostgreSQL array types
- [[#7664](https://github.com/apache/incubator-seata/pull/7664)] support
shentongdatabase XA mode
+- [[#7663](https://github.com/apache/incubator-seata/pull/7663)] add Java 25
support in CI configuration files
+
### bugfix:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index f80ffb4bd8..f3783f8234 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -27,6 +27,7 @@
- [[#7559](https://github.com/apache/incubator-seata/pull/7559)] 为
TableMetaRefreshHolder 实例引入清理 API
- [[#7669](https://github.com/apache/incubator-seata/pull/7669)] 添加对 Jackson
序列化和反序列化 PostgreSQL 数组类型的支持
- [[#7664](https://github.com/apache/incubator-seata/pull/7565)] 支持神通数据库的XA模式
+- [[#7663](https://github.com/apache/incubator-seata/pull/7663)]
支持java25版本的CI流水綫
### bugfix:
diff --git
a/serializer/seata-serializer-protobuf/src/test/java/org/apache/seata/serializer/protobuf/convertor/GlobalReportRequestConvertorTest.java
b/serializer/seata-serializer-protobuf/src/test/java/org/apache/seata/serializer/protobuf/convertor/GlobalReportRequestConvertorTest.java
new file mode 100644
index 0000000000..fe2dc04401
--- /dev/null
+++
b/serializer/seata-serializer-protobuf/src/test/java/org/apache/seata/serializer/protobuf/convertor/GlobalReportRequestConvertorTest.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.seata.serializer.protobuf.convertor;
+
+import org.apache.seata.core.model.GlobalStatus;
+import org.apache.seata.core.protocol.transaction.GlobalReportRequest;
+import org.apache.seata.serializer.protobuf.generated.GlobalReportRequestProto;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class GlobalReportRequestConvertorTest {
+
+ @Test
+ public void convert2Proto() {
+
+ GlobalReportRequest globalReportRequest = new GlobalReportRequest();
+ globalReportRequest.setExtraData("extraData");
+ globalReportRequest.setXid("xid");
+ globalReportRequest.setGlobalStatus(GlobalStatus.Committed);
+
+ GlobalReportRequestConvertor convertor = new
GlobalReportRequestConvertor();
+ GlobalReportRequestProto proto =
convertor.convert2Proto(globalReportRequest);
+ GlobalReportRequest real = convertor.convert2Model(proto);
+
assertThat((real.getTypeCode())).isEqualTo(globalReportRequest.getTypeCode());
+ assertThat((real.getXid())).isEqualTo(globalReportRequest.getXid());
+
assertThat((real.getExtraData())).isEqualTo(globalReportRequest.getExtraData());
+
assertThat((real.getGlobalStatus())).isEqualTo(globalReportRequest.getGlobalStatus());
+ }
+}
diff --git
a/serializer/seata-serializer-protobuf/src/test/java/org/apache/seata/serializer/protobuf/convertor/GlobalReportResponseConvertorTest.java
b/serializer/seata-serializer-protobuf/src/test/java/org/apache/seata/serializer/protobuf/convertor/GlobalReportResponseConvertorTest.java
new file mode 100644
index 0000000000..e42b10d888
--- /dev/null
+++
b/serializer/seata-serializer-protobuf/src/test/java/org/apache/seata/serializer/protobuf/convertor/GlobalReportResponseConvertorTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.seata.serializer.protobuf.convertor;
+
+import org.apache.seata.core.model.GlobalStatus;
+import org.apache.seata.core.protocol.ResultCode;
+import org.apache.seata.core.protocol.transaction.GlobalReportResponse;
+import
org.apache.seata.serializer.protobuf.generated.GlobalReportResponseProto;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class GlobalReportResponseConvertorTest {
+
+ @Test
+ public void convert2Proto() {
+
+ GlobalReportResponse globalReportResponse = new GlobalReportResponse();
+ globalReportResponse.setGlobalStatus(GlobalStatus.Committed);
+ globalReportResponse.setResultCode(ResultCode.Success);
+
+ GlobalReportResponseConvertor convertor = new
GlobalReportResponseConvertor();
+ GlobalReportResponseProto proto =
convertor.convert2Proto(globalReportResponse);
+ GlobalReportResponse real = convertor.convert2Model(proto);
+
assertThat((real.getTypeCode())).isEqualTo(globalReportResponse.getTypeCode());
+
assertThat((real.getGlobalStatus())).isEqualTo(globalReportResponse.getGlobalStatus());
+
assertThat((real.getResultCode())).isEqualTo(globalReportResponse.getResultCode());
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
