This is an automated email from the ASF dual-hosted git repository.
funky-eyes pushed a commit to branch 2.7.0
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.7.0 by this push:
new e9eb9e0374 bugfix: add test-springboot3.x-jdk25 job for JDK 25
compatibility in CI workflows (#8142)
e9eb9e0374 is described below
commit e9eb9e037410578a7184812a883542002ff712d2
Author: funkye <[email protected]>
AuthorDate: Fri Jun 12 10:24:20 2026 +0800
bugfix: add test-springboot3.x-jdk25 job for JDK 25 compatibility in CI
workflows (#8142)
---
.github/workflows/test-druid.yml | 2 +-
.github/workflows/test-ubuntu.yml | 65 ++++++++++++++++++++++++++++++++++++---
.github/workflows/test.yml | 63 ++++++++++++++++++++++++++++++++++---
build/pom.xml | 9 +-----
dependencies/pom.xml | 2 +-
namingserver/pom.xml | 17 ++++++++--
server/pom.xml | 25 +++++++++++----
7 files changed, 156 insertions(+), 27 deletions(-)
diff --git a/.github/workflows/test-druid.yml b/.github/workflows/test-druid.yml
index 222edaf768..f9e754d42b 100644
--- a/.github/workflows/test-druid.yml
+++ b/.github/workflows/test-druid.yml
@@ -95,5 +95,5 @@ jobs:
- name: "Test with Maven and Druid ${{ matrix.druid }}"
run: |
./mvnw -T 4C clean test \
- -Ddruid.version=${{ matrix.druid }} \
+ -Dskip.npm=true -Ddruid.version=${{ matrix.druid }} \
-e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
diff --git a/.github/workflows/test-ubuntu.yml
b/.github/workflows/test-ubuntu.yml
index cbac3729c7..d49f1265ef 100644
--- a/.github/workflows/test-ubuntu.yml
+++ b/.github/workflows/test-ubuntu.yml
@@ -75,7 +75,7 @@ jobs:
## step 4.1: for Ubuntu and MacOS
- name: "Test with Maven on '${{ matrix.os }}' OS"
run: |
- ./mvnw -T 4C clean test -P args-for-client-test
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ ./mvnw -T 4C clean test -P args-for-client-test -Dskip.npm=true
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
# job 2
test-springboot3x:
@@ -99,7 +99,7 @@ jobs:
max-parallel: 6
fail-fast: false
matrix:
- java: [ 17, 21, 25 ]
+ java: [ 17, 21 ]
os: [
ubuntu-24.04,
]
@@ -129,15 +129,72 @@ jobs:
- name: "Test with Maven on '${{ matrix.os }}' OS"
if: ${{ ! startsWith(matrix.os, 'windows') }}
run: |
- ./mvnw -T 4C clean test -P args-for-client-test
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ ./mvnw -T 4C clean test -P args-for-client-test -Dskip.npm=true
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
## step 4.2: for Windows
- name: "Build with Maven on 'windows' OS (Skip tests)"
if: ${{ startsWith(matrix.os, 'windows') }}
run: | # Skip tests, because too many errors in unit-test.
./mvnw.cmd -version;
./mvnw.cmd clean install -P args-for-client-test -DskipTests -D
spring-boot.version=${{ matrix.springboot }} -e -B -D
org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
-
# job 3
+ test-springboot3x-jdk25:
+ name: "test-springboot3.x-jdk25"
+ services:
+ redis:
+ image: redis:7.2
+ ports:
+ - 6379:6379
+ options: --health-cmd="redis-cli ping" --health-interval=10s
--health-timeout=5s --health-retries=3
+ nacos:
+ image: nacos/nacos-server:v2.4.2
+ ports:
+ - 8848:8848
+ env:
+ MODE: standalone
+ SPRING_SECURITY_ENABLED: false
+ options: --health-cmd="curl -f http://localhost:8848/nacos";
--health-interval=10s --health-timeout=5s --health-retries=3
--health-start-period=30s
+ runs-on: "${{ matrix.os }}"
+ strategy:
+ max-parallel: 6
+ fail-fast: false
+ matrix:
+ java: [ 25 ]
+ os: [
+ ubuntu-24.04,
+ ]
+ springboot: [
+ 3.4.13 -D spring-framework-bom.version=6.2.15 -D
mockito.version=5.14.2 -D junit-jupiter.version=5.11.4,
+ 3.5.14 -D spring-framework-bom.version=6.2.18 -D
mockito.version=5.17.0 -D junit-jupiter.version=5.12.2,
+ ]
+ steps:
+ # step 1
+ - name: "Checkout"
+ uses: actions/checkout@v3
+ # step 2
+ - name: "Use Python 3.x"
+ uses: actions/setup-python@v2
+ with:
+ python-version: '3.12'
+ # step 3
+ - name: "Set up Java JDK"
+ uses: actions/[email protected]
+ with:
+ distribution: 'zulu'
+ java-version: ${{ matrix.java }}
+ # step 4
+ ## step 4.1: for Ubuntu and MacOS
+ - name: "Test with Maven on '${{ matrix.os }}' OS"
+ if: ${{ ! startsWith(matrix.os, 'windows') }}
+ run: |
+ ./mvnw -T 4C clean test -P args-for-client-test -Dskip.npm=true
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ ## step 4.2: for Windows
+ - name: "Build with Maven on 'windows' OS (Skip tests)"
+ if: ${{ startsWith(matrix.os, 'windows') }}
+ run: | # Skip tests, because too many errors in unit-test.
+ ./mvnw.cmd -version;
+ ./mvnw.cmd clean install -P args-for-client-test -DskipTests -D
spring-boot.version=${{ matrix.springboot }} -e -B -D
org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+
+ # job 4
test-arm64:
name: "test-arm64"
runs-on: ubuntu-24.04-arm
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ba34c0a7ec..445d414a3b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -69,9 +69,9 @@ jobs:
if ! python3 -c "import distutils" &>/dev/null; then
python3 -m pip install --upgrade setuptools
fi
- ./mvnw -T 4C clean test -P args-for-client-test -P arrch64
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ ./mvnw -T 4C clean test -P args-for-client-test -P arrch64
-Dskip.npm=true -Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
else
- ./mvnw -T 4C clean test -P args-for-client-test
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ ./mvnw -T 4C clean test -P args-for-client-test -Dskip.npm=true
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
fi
## step 4.2: for Windows
- name: "Build with Maven on 'windows' OS (Skip tests)"
@@ -88,7 +88,7 @@ jobs:
max-parallel: 6
fail-fast: false
matrix:
- java: [ 17, 21, 25 ]
+ java: [ 17, 21 ]
os: [
macos-14,
windows-2022, # Skip tests, because too many errors in unit-test.
@@ -125,9 +125,62 @@ jobs:
if ! python3 -c "import distutils" &>/dev/null; then
python3 -m pip install --upgrade setuptools
fi
- ./mvnw -T 4C clean test -P args-for-client-test -P arrch64
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ ./mvnw -T 4C clean test -P args-for-client-test -P arrch64
-Dskip.npm=true -Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
else
- ./mvnw -T 4C clean test -P args-for-client-test
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ ./mvnw -T 4C clean test -P args-for-client-test -Dskip.npm=true
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ fi
+ ## step 4.2: for Windows
+ - name: "Build with Maven on 'windows' OS (Skip tests)"
+ if: ${{ startsWith(matrix.os, 'windows') }}
+ run: | # Skip tests, because too many errors in unit-test.
+ ./mvnw.cmd -version;
+ ./mvnw.cmd clean install -P args-for-client-test -DskipTests -D
spring-boot.version=${{ matrix.springboot }} -e -B -D
org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ # job 3
+ test-springboot3x-jdk25:
+ name: "test-springboot3.x-jdk25"
+ runs-on: "${{ matrix.os }}"
+ strategy:
+ max-parallel: 6
+ fail-fast: false
+ matrix:
+ java: [ 25 ]
+ os: [
+ macos-14,
+ windows-2022, # Skip tests, because too many errors in unit-test.
+ ]
+ springboot: [
+ 3.4.13 -D spring-framework-bom.version=6.2.15 -D
mockito.version=5.14.2 -D junit-jupiter.version=5.11.4,
+ 3.5.14 -D spring-framework-bom.version=6.2.18 -D
mockito.version=5.17.0 -D junit-jupiter.version=5.12.2,
+ ]
+ steps:
+ # step 1
+ - name: "Checkout"
+ uses: actions/checkout@v3
+ # step 2
+ - name: "Use Python 3.x"
+ uses: actions/setup-python@v2
+ with:
+ python-version: '3.12'
+ # step 3
+ - name: "Set up Java JDK"
+ uses: actions/[email protected]
+ with:
+ distribution: 'zulu'
+ java-version: ${{ matrix.java }}
+ # step 4
+ ## step 4.1: for Ubuntu and MacOS
+ - name: "Test with Maven on '${{ matrix.os }}' OS"
+ if: ${{ ! startsWith(matrix.os, 'windows') }}
+ run: |
+ if [[ "${{ matrix.os }}" =~ "macos" ]]; then
+ python3 -m ensurepip --upgrade;
+ python3 -m pip install --upgrade pip setuptools;
+ if ! python3 -c "import distutils" &>/dev/null; then
+ python3 -m pip install --upgrade setuptools
+ fi
+ ./mvnw -T 4C clean test -P args-for-client-test -P arrch64
-Dskip.npm=true -Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ else
+ ./mvnw -T 4C clean test -P args-for-client-test -Dskip.npm=true
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
fi
## step 4.2: for Windows
- name: "Build with Maven on 'windows' OS (Skip tests)"
diff --git a/build/pom.xml b/build/pom.xml
index e482773917..b55bcbc58f 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -89,6 +89,7 @@
<kafka-clients.version>3.9.2</kafka-clients.version>
<snakeyaml.version>2.0</snakeyaml.version>
<bucket4j.version>8.1.0</bucket4j.version>
+ <groovy.version>4.0.32</groovy.version>
<!-- For test -->
<junit-jupiter.version>5.8.2</junit-jupiter.version>
@@ -437,13 +438,5 @@
</maven.surefire.argLine>
</properties>
</profile>
-
- <!-- profile: args-for-client-test -->
- <profile>
- <id>args-for-client-test</id>
- <properties>
-
<maven.surefire.excludes>org/apache/seata/server/**/*.java,org/apache/seata/console/**/*.java</maven.surefire.excludes>
- </properties>
- </profile>
</profiles>
</project>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 59c194cddd..10f63af5b4 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -39,7 +39,7 @@
<dubbo-seata.version>1.0.2</dubbo-seata.version>
<brpc.version>2.5.9</brpc.version>
<hsf.version>1.8.3</hsf.version>
- <bytebuddy.version>1.14.15</bytebuddy.version>
+ <bytebuddy.version>1.15.11</bytebuddy.version>
<dubbo.alibaba.version>2.6.10</dubbo.alibaba.version>
<sofa.rpc.version>5.6.5</sofa.rpc.version>
<fastjson.version>1.2.83</fastjson.version>
diff --git a/namingserver/pom.xml b/namingserver/pom.xml
index 7359e004c3..0d391cf3c8 100644
--- a/namingserver/pom.xml
+++ b/namingserver/pom.xml
@@ -16,8 +16,8 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -315,6 +315,19 @@
</plugins>
</build>
</profile>
+ <!-- profile: args-for-client-test -->
+ <profile>
+ <id>args-for-client-test</id>
+ <activation>
+ <property>
+ <name>args-for-client-test</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ </profile>
</profiles>
diff --git a/server/pom.xml b/server/pom.xml
index 9de1f40786..d0d770a267 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -18,8 +18,8 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.seata</groupId>
<artifactId>seata-parent</artifactId>
@@ -167,7 +167,7 @@
<artifactId>seata-metrics-all</artifactId>
<version>${project.version}</version>
</dependency>
-<!--
+ <!--
<dependency>
<groupId>${project.groupId}</groupId>
@@ -194,13 +194,13 @@
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
- <!-- if you run seata-server in IDE and use mysql8 as session store,
please rewrite version to ${mysql8.jdbc.version}-->
+ <!-- if you run seata-server in IDE and use mysql8 as session store,
please rewrite version to ${mysql8.jdbc.version}-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>test</scope>
</dependency>
-<!-- <dependency>
+ <!-- <dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<scope>provided</scope>
@@ -528,5 +528,18 @@
</plugins>
</build>
</profile>
+ <!-- profile: args-for-client-test -->
+ <profile>
+ <id>args-for-client-test</id>
+ <activation>
+ <property>
+ <name>args-for-client-test</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ </profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
