Skip to content

Commit 77331be

Browse files
authored
feature: add Java 25 support in CI configuration files (#7663)
1 parent 0605fa8 commit 77331be

File tree

9 files changed

+96
-6
lines changed

9 files changed

+96
-6
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
strategy:
4848
fail-fast: false
4949
matrix:
50-
java: [ 8, 17, 21 ]
50+
java: [ 8, 17, 21, 25 ]
5151
steps:
5252
# step 1
5353
- name: "Checkout"

.github/workflows/publish-docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
strategy:
3434
fail-fast: false
3535
matrix:
36-
java: [ 8, 17, 21 ]
36+
java: [ 8, 17, 21, 25 ]
3737
steps:
3838
# step 1
3939
- name: "Checkout"

.github/workflows/test-ubuntu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
max-parallel: 3
4343
fail-fast: false
4444
matrix:
45-
java: [ 8, 11, 17, 21 ]
45+
java: [ 8, 11, 17, 21, 25 ]
4646
os: [
4747
ubuntu-24.04,
4848
]
@@ -99,7 +99,7 @@ jobs:
9999
max-parallel: 3
100100
fail-fast: false
101101
matrix:
102-
java: [ 17, 21 ]
102+
java: [ 17, 21, 25 ]
103103
os: [
104104
ubuntu-24.04,
105105
]

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
max-parallel: 3
8989
fail-fast: false
9090
matrix:
91-
java: [ 17, 21 ]
91+
java: [ 17, 21, 25 ]
9292
os: [
9393
macos-14,
9494
windows-2022, # Skip tests, because too many errors in unit-test.

build/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<!-- Compiler -->
102102
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
103103
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
104-
<kotlin-maven-plugin.version>1.9.21</kotlin-maven-plugin.version>
104+
<kotlin-maven-plugin.version>2.2.20</kotlin-maven-plugin.version>
105105
<!-- Check -->
106106
<maven-pmd-plugin.version>3.8</maven-pmd-plugin.version>
107107
<p3c-pmd.version>1.3.6</p3c-pmd.version>

changes/en-us/2.x.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ Add changes here for all PR submitted to the 2.x branch.
2727
- [[#7559](https://github.com/apache/incubator-seata/pull/7559)] Introduce Cleanup API for TableMetaRefreshHolder Instance
2828
- [[#7669](https://github.com/apache/incubator-seata/pull/7669)] add support for Jackson serialization and deserialization of PostgreSQL array types
2929
- [[#7664](https://github.com/apache/incubator-seata/pull/7664)] support shentongdatabase XA mode
30+
- [[#7663](https://github.com/apache/incubator-seata/pull/7663)] add Java 25 support in CI configuration files
31+
3032

3133
### bugfix:
3234

changes/zh-cn/2.x.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
- [[#7559](https://github.com/apache/incubator-seata/pull/7559)] 为 TableMetaRefreshHolder 实例引入清理 API
2828
- [[#7669](https://github.com/apache/incubator-seata/pull/7669)] 添加对 Jackson 序列化和反序列化 PostgreSQL 数组类型的支持
2929
- [[#7664](https://github.com/apache/incubator-seata/pull/7565)] 支持神通数据库的XA模式
30+
- [[#7663](https://github.com/apache/incubator-seata/pull/7663)] 支持java25版本的CI流水綫
3031

3132

3233
### bugfix:
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
package org.apache.seata.serializer.protobuf.convertor;
18+
19+
import org.apache.seata.core.model.GlobalStatus;
20+
import org.apache.seata.core.protocol.transaction.GlobalReportRequest;
21+
import org.apache.seata.serializer.protobuf.generated.GlobalReportRequestProto;
22+
import org.junit.jupiter.api.Test;
23+
24+
import static org.assertj.core.api.Assertions.assertThat;
25+
26+
public class GlobalReportRequestConvertorTest {
27+
28+
@Test
29+
public void convert2Proto() {
30+
31+
GlobalReportRequest globalReportRequest = new GlobalReportRequest();
32+
globalReportRequest.setExtraData("extraData");
33+
globalReportRequest.setXid("xid");
34+
globalReportRequest.setGlobalStatus(GlobalStatus.Committed);
35+
36+
GlobalReportRequestConvertor convertor = new GlobalReportRequestConvertor();
37+
GlobalReportRequestProto proto = convertor.convert2Proto(globalReportRequest);
38+
GlobalReportRequest real = convertor.convert2Model(proto);
39+
assertThat((real.getTypeCode())).isEqualTo(globalReportRequest.getTypeCode());
40+
assertThat((real.getXid())).isEqualTo(globalReportRequest.getXid());
41+
assertThat((real.getExtraData())).isEqualTo(globalReportRequest.getExtraData());
42+
assertThat((real.getGlobalStatus())).isEqualTo(globalReportRequest.getGlobalStatus());
43+
}
44+
}
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
package org.apache.seata.serializer.protobuf.convertor;
18+
19+
import org.apache.seata.core.model.GlobalStatus;
20+
import org.apache.seata.core.protocol.ResultCode;
21+
import org.apache.seata.core.protocol.transaction.GlobalReportResponse;
22+
import org.apache.seata.serializer.protobuf.generated.GlobalReportResponseProto;
23+
import org.junit.jupiter.api.Test;
24+
25+
import static org.assertj.core.api.Assertions.assertThat;
26+
27+
public class GlobalReportResponseConvertorTest {
28+
29+
@Test
30+
public void convert2Proto() {
31+
32+
GlobalReportResponse globalReportResponse = new GlobalReportResponse();
33+
globalReportResponse.setGlobalStatus(GlobalStatus.Committed);
34+
globalReportResponse.setResultCode(ResultCode.Success);
35+
36+
GlobalReportResponseConvertor convertor = new GlobalReportResponseConvertor();
37+
GlobalReportResponseProto proto = convertor.convert2Proto(globalReportResponse);
38+
GlobalReportResponse real = convertor.convert2Model(proto);
39+
assertThat((real.getTypeCode())).isEqualTo(globalReportResponse.getTypeCode());
40+
assertThat((real.getGlobalStatus())).isEqualTo(globalReportResponse.getGlobalStatus());
41+
assertThat((real.getResultCode())).isEqualTo(globalReportResponse.getResultCode());
42+
}
43+
}

0 commit comments

Comments
 (0)