This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.6.0
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.6.0 by this push:
new f40ca4aab0 optimize: pin the Spring version for namingserver and
console (#7931)
f40ca4aab0 is described below
commit f40ca4aab077c23ee3d80001b1830b342bf63b64
Author: funkye <[email protected]>
AuthorDate: Tue Jan 13 17:00:18 2026 +0800
optimize: pin the Spring version for namingserver and console (#7931)
---
.github/workflows/test-ubuntu.yml | 63 +++++++++++++++++++--------------------
.github/workflows/test.yml | 20 ++++++-------
build/pom.xml | 4 +--
changes/en-us/2.6.0.md | 1 +
changes/zh-cn/2.6.0.md | 2 ++
console/pom.xml | 9 ++++++
dependencies/pom.xml | 2 +-
namingserver/pom.xml | 13 ++++++--
8 files changed, 66 insertions(+), 48 deletions(-)
diff --git a/.github/workflows/test-ubuntu.yml
b/.github/workflows/test-ubuntu.yml
index 3a61284ded..52b2839367 100644
--- a/.github/workflows/test-ubuntu.yml
+++ b/.github/workflows/test-ubuntu.yml
@@ -47,12 +47,12 @@ jobs:
ubuntu-24.04,
]
springboot: [
- 2.7.18 -D spring-framework.version=5.3.31,
- 2.6.15 -D spring-framework.version=5.3.27,
- 2.5.15 -D spring-framework.version=5.3.27,
- 2.4.13 -D spring-framework.version=5.3.13,
- 2.3.12.RELEASE -D spring-framework.version=5.2.15.RELEASE,
-# 2.2.13.RELEASE -D spring-framework.version=5.2.12.RELEASE,
+ 2.7.18 -D spring-framework-bom.version=5.3.31,
+ 2.6.15 -D spring-framework-bom.version=5.3.27,
+ 2.5.15 -D spring-framework-bom.version=5.3.27,
+ 2.4.13 -D spring-framework-bom.version=5.3.13,
+ 2.3.12.RELEASE -D spring-framework-bom.version=5.2.15.RELEASE,
+ # 2.2.13.RELEASE -D
spring-framework-bom.version=5.2.12.RELEASE,
#2.1.18.RELEASE,
#2.0.9.RELEASE,
]
@@ -104,10 +104,10 @@ jobs:
ubuntu-24.04,
]
springboot: [
- 3.3.0 -D spring-framework.version=6.1.18 -D mockito.version=5.11.0
-D junit-jupiter.version=5.10.2,
- 3.2.0 -D spring-framework.version=6.1.1 -D mockito.version=5.7.0
-D junit-jupiter.version=5.10.1,
- 3.1.6 -D spring-framework.version=6.0.14 -D mockito.version=5.3.1
-D junit-jupiter.version=5.9.3,
- 3.0.13 -D spring-framework.version=6.0.14,
+ 3.3.0 -D spring-framework-bom.version=6.1.18 -D
mockito.version=5.11.0 -D junit-jupiter.version=5.10.2,
+ 3.2.0 -D spring-framework-bom.version=6.1.1 -D
mockito.version=5.7.0 -D junit-jupiter.version=5.10.1,
+ 3.1.6 -D spring-framework-bom.version=6.0.14 -D
mockito.version=5.3.1 -D junit-jupiter.version=5.9.3,
+ 3.0.13 -D spring-framework-bom.version=6.0.14,
]
steps:
# step 1
@@ -140,17 +140,17 @@ jobs:
# job 3
test-arm64:
name: "test-arm64"
- runs-on: ubuntu-24.04
+ runs-on: ubuntu-24.04-arm
strategy:
fail-fast: false
matrix:
springboot: [
- #2.7.18 -Dspring-framework.version=5.3.31, # The
maven-compiler-plugin will throw an error for an unknown reason.
- #2.6.15 -Dspring-framework.version=5.3.27, # The
maven-compiler-plugin will throw an error for an unknown reason.
- #2.5.15 -Dspring-framework.version=5.3.27, # The
maven-compiler-plugin will throw an error for an unknown reason.
- 2.4.13 -Dspring-framework.version=5.3.13,
- 2.3.12.RELEASE -Dspring-framework.version=5.2.15.RELEASE,
- 2.2.13.RELEASE -Dspring-framework.version=5.2.12.RELEASE,
+ 2.7.18 -Dspring-framework-bom.version=5.3.31, # The
maven-compiler-plugin will throw an error for an unknown reason.
+ 2.6.15 -Dspring-framework-bom.version=5.3.27, # The
maven-compiler-plugin will throw an error for an unknown reason.
+ 2.5.15 -Dspring-framework-bom.version=5.3.27, # The
maven-compiler-plugin will throw an error for an unknown reason.
+ 2.4.13 -Dspring-framework-bom.version=5.3.13,
+ 2.3.12.RELEASE -Dspring-framework-bom.version=5.2.15.RELEASE,
+ 2.2.13.RELEASE -Dspring-framework-bom.version=5.2.12.RELEASE,
#2.1.18.RELEASE,
#2.0.9.RELEASE,
]
@@ -159,21 +159,18 @@ jobs:
- name: "Checkout"
uses: actions/checkout@v3
# step 2
- - name: "Set up QEMU"
- id: qemu
- uses: docker/setup-qemu-action@v3
+ - name: "Set up Java JDK 25"
+ uses: actions/[email protected]
+ with:
+ distribution: 'zulu'
+ java-version: 25
+ # step 4
+ - name: "Print maven version"
+ run: ./mvnw -version
# step 3
- - name: "Build with Maven on 'arm64v8/ubuntu:20.04' OS (Skip tests)"
+ - name: "Build with Maven on 'arm64v8/ubuntu:24.04' OS (Skip tests)"
run: |
- docker run --rm -v ${{ github.workspace }}:/ws:rw --workdir=/ws \
- --platform linux/arm64 arm64v8/ubuntu:20.04 \
- bash -exc 'apt-get update -y && \
- apt-get install maven -y && \
- apt-get install -y python3 python3-pip
python3-distutils && \
- apt-get install -y build-essential && \
- mvn -version && \
- mvn -T 4C clean install \
- -Dspring-boot.version=${{ matrix.springboot }} \
- -Prelease-seata \
- -DskipTests \
- -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+ ./mvnw -T 4C clean install -Dspring-boot.version=${{
matrix.springboot }} \
+ -Prelease-seata \
+ -DskipTests \
+ -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 295add3927..3004bee0dc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -34,12 +34,12 @@ jobs:
windows-2022, # Skip tests, because too many errors in unit-test.
]
springboot: [
- 2.7.18 -D spring-framework.version=5.3.31,
- 2.6.15 -D spring-framework.version=5.3.27,
- 2.5.15 -D spring-framework.version=5.3.27,
- 2.4.13 -D spring-framework.version=5.3.13,
- 2.3.12.RELEASE -D spring-framework.version=5.2.15.RELEASE,
-# 2.2.13.RELEASE -D spring-framework.version=5.2.12.RELEASE,
+ 2.7.18 -D spring-framework-bom.version=5.3.31,
+ 2.6.15 -D spring-framework-bom.version=5.3.27,
+ 2.5.15 -D spring-framework-bom.version=5.3.27,
+ 2.4.13 -D spring-framework-bom.version=5.3.13,
+ 2.3.12.RELEASE -D spring-framework-bom.version=5.2.15.RELEASE,
+# 2.2.13.RELEASE -D spring-framework-bom.version=5.2.12.RELEASE,
#2.1.18.RELEASE,
#2.0.9.RELEASE,
]
@@ -94,10 +94,10 @@ jobs:
windows-2022, # Skip tests, because too many errors in unit-test.
]
springboot: [
- 3.3.0 -D spring-framework.version=6.1.18 -D mockito.version=5.11.0
-D junit-jupiter.version=5.10.2,
- 3.2.0 -D spring-framework.version=6.1.1 -D mockito.version=5.7.0
-D junit-jupiter.version=5.10.1,
- 3.1.6 -D spring-framework.version=6.0.14 -D mockito.version=5.3.1
-D junit-jupiter.version=5.9.3,
- 3.0.13 -D spring-framework.version=6.0.14,
+ 3.3.0 -D spring-framework-bom.version=6.1.18 -D
mockito.version=5.11.0 -D junit-jupiter.version=5.10.2,
+ 3.2.0 -D spring-framework-bom.version=6.1.1 -D
mockito.version=5.7.0 -D junit-jupiter.version=5.10.1,
+ 3.1.6 -D spring-framework-bom.version=6.0.14 -D
mockito.version=5.3.1 -D junit-jupiter.version=5.9.3,
+ 3.0.13 -D spring-framework-bom.version=6.0.14,
]
steps:
# step 1
diff --git a/build/pom.xml b/build/pom.xml
index 4470109609..4b435859a8 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -82,7 +82,7 @@
<!-- The version of spring-boot for 'spring-boot-dependencies' and
'spring-boot-maven-plugin' -->
<spring-boot.version>2.7.18</spring-boot.version>
- <spring-framework.version>5.3.39</spring-framework.version>
+ <spring-framework-bom.version>5.3.39</spring-framework-bom.version>
<!-- server side dependency-->
<kafka-appender.version>0.2.0-RC2</kafka-appender.version>
@@ -99,7 +99,7 @@
<easyj-maven-plugin.version>1.1.5</easyj-maven-plugin.version>
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
<!-- Compiler -->
- <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+ <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
<kotlin-maven-plugin.version>2.2.20</kotlin-maven-plugin.version>
<!-- Check -->
diff --git a/changes/en-us/2.6.0.md b/changes/en-us/2.6.0.md
index 74516ad861..de6d6941f2 100644
--- a/changes/en-us/2.6.0.md
+++ b/changes/en-us/2.6.0.md
@@ -111,6 +111,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7894](https://github.com/apache/incubator-seata/pull/7894)] optimize
method and class names in the saga module
- [[#7909](https://github.com/apache/incubator-seata/pull/7909)] add comments
to the namingserver address configuration in console application file
- [[#7913](https://github.com/apache/incubator-seata/pull/7913)] remove
@author info
+- [[#7931](https://github.com/apache/incubator-seata/pull/7931)] pin the
Spring version for namingserver and console
### security:
diff --git a/changes/zh-cn/2.6.0.md b/changes/zh-cn/2.6.0.md
index 6db196542a..359dd4085f 100644
--- a/changes/zh-cn/2.6.0.md
+++ b/changes/zh-cn/2.6.0.md
@@ -110,6 +110,8 @@
- [[#7894](https://github.com/apache/incubator-seata/pull/7894)]
优化saga模块中的方法名和类名
- [[#7909](https://github.com/apache/incubator-seata/pull/7909)]
在控制台配置文件中为namingserver地址配置添加注释
- [[#7913](https://github.com/apache/incubator-seata/pull/7913)] 移除 @author 信息
+- [[#7931](https://github.com/apache/incubator-seata/pull/7931)]
固定namingserver和console的spring版本
+
### security:
diff --git a/console/pom.xml b/console/pom.xml
index fb8ab3eb1a..235449263c 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -33,6 +33,7 @@
<properties>
<spring-boot-for-server.version>3.5.2</spring-boot-for-server.version>
+
<spring-framework-for-server.version>6.2.8</spring-framework-for-server.version>
<snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>
<tomcat-embed.version>11.0.12</tomcat-embed.version>
<spring-ai.version>1.1.0</spring-ai.version>
@@ -63,6 +64,14 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!-- spring-framework-->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-framework-bom</artifactId>
+ <version>${spring-framework-for-server.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 22a186c62d..09f8d431ee 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -162,7 +162,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
- <version>${spring-framework.version}</version>
+ <version>${spring-framework-bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/namingserver/pom.xml b/namingserver/pom.xml
index 38ae81dd63..55ec816916 100644
--- a/namingserver/pom.xml
+++ b/namingserver/pom.xml
@@ -33,6 +33,7 @@
<properties>
<java.version>25</java.version>
<spring-boot-for-server.version>3.5.2</spring-boot-for-server.version>
+
<spring-framework-for-server.version>6.2.8</spring-framework-for-server.version>
<snakeyaml-for-server.version>2.0</snakeyaml-for-server.version>
<tomcat-embed.version>11.0.12</tomcat-embed.version>
<httpclient.version>5.4.3</httpclient.version>
@@ -40,7 +41,7 @@
<dependencyManagement>
<dependencies>
- <!-- Spring Boot -->
+ <!-- Spring Boot -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
@@ -48,6 +49,14 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!-- spring-framework -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-framework-bom</artifactId>
+ <version>${spring-framework-for-server.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -90,6 +99,7 @@
<version>${tomcat-embed.version}</version>
</dependency>
+ <!-- Force override explicit versions for key dependencies to bypass
BOM conflict -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
@@ -112,7 +122,6 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
