Skip to content

Commit 9c0f1e9

Browse files
Timmyclaude
andcommitted
chore: unify Spring Boot version catalog to single spring-boot entry
Remove legacy spring-boot-1x/2x split in libs.versions.toml and merge into a single spring-boot = "4.0.3" definition. Update all build scripts and documentation to reflect the current Spring Boot 4.0 baseline. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 6b3a620 commit 9c0f1e9

8 files changed

Lines changed: 17 additions & 22 deletions

File tree

docs-en/tars-java-start.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Directly copy tars-java-tools-1.0.0.jar in the jar folder to the project directo
1818
- JDK1.8 or above
1919
- Maven 3.5 or above
2020

21-
- Spring Boot 2.1.3 or above
21+
- Spring Boot 4.0 or above
2222

2323
- Execute maven packaging in the project root directory: `mvn package`
2424

docs-en/tars-tutorials.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ If you need new functions like tars-spring, you need to upgrade the tars to the
9999

100100
### Function Description
101101

102-
Tars supports writing tars services using spring boot. To use this function, you need to rely on the tars-spring-boot-starter.jar package, and spring boot 2.0 or above. You can use your servant as a Spring bean, and the annotation exposes the spring bean.
102+
Tars supports writing tars services using spring boot. To use this function, you need to rely on the tars-spring-boot-starter.jar package, and Spring Boot 4.0 or above. You can use your servant as a Spring bean, and the annotation exposes the spring bean.
103103

104104

105105

@@ -117,7 +117,7 @@ Tars supports writing tars services using spring boot. To use this function, you
117117

118118
- Maven 3.5 or above
119119

120-
- Spring Boot 2.0 or above
120+
- Spring Boot 4.0 or above
121121

122122

123123

docs/tars-java-start.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
- JDK 1.8或以上版本
1919
- Maven 3.5或以上版本
20-
- Spring Boot 2.1.3或以上版本
20+
- Spring Boot 4.0或以上版本
2121

2222
- 在项目根目录下执行maven打包:`mvn package`
2323

docs/tars-tutorials.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ listener的配置与servant配置相同,也需要将你的Listener定义为bea
103103

104104
### 功能说明
105105

106-
Tars支持使用通过spring boot的方式编写Tars服务,使用此功能需要依赖tars-spring-boot-starter.jar包,以及Spring Boot 2.0及以上版本。你可以将你的servant作为一个Spring bean,注解暴露spring bean即可。
106+
Tars支持使用通过spring boot的方式编写Tars服务,使用此功能需要依赖tars-spring-boot-starter.jar包,以及Spring Boot 4.0及以上版本。你可以将你的servant作为一个Spring bean,注解暴露spring bean即可。
107107

108108

109109

@@ -119,7 +119,7 @@ Tars支持使用通过spring boot的方式编写Tars服务,使用此功能需
119119

120120
- JDK 1.8或以上版本
121121
- Maven 3.5或以上版本
122-
- Spring Boot 2.0或以上版本
122+
- Spring Boot 4.0或以上版本
123123

124124

125125

gradle/libs.versions.toml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ log4j2 = "2.25.3"
1818

1919
# Spring
2020
spring = "7.0.5"
21-
spring-boot-1x = "4.0.3"
22-
spring-boot-2x = "4.0.3"
21+
spring-boot = "4.0.3"
2322

2423
# Spring Cloud
2524
eureka-client = "2.0.5"
@@ -82,14 +81,10 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
8281
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
8382
log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j2" }
8483

85-
# Spring Boot 1.x (for tars-spring)
86-
spring-boot-starter-v1 = { module = "org.springframework.boot:spring-boot-starter", version.ref = "spring-boot-1x" }
87-
spring-boot-configuration-processor-v1 = { module = "org.springframework.boot:spring-boot-configuration-processor", version.ref = "spring-boot-1x" }
88-
89-
# Spring Boot 2.x (for tars-spring-boot-starter, tars-http-extension)
90-
spring-boot-starter-v2 = { module = "org.springframework.boot:spring-boot-starter", version.ref = "spring-boot-2x" }
91-
spring-boot-configuration-processor-v2 = { module = "org.springframework.boot:spring-boot-configuration-processor", version.ref = "spring-boot-2x" }
92-
spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "spring-boot-2x" }
84+
# Spring Boot
85+
spring-boot-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "spring-boot" }
86+
spring-boot-configuration-processor = { module = "org.springframework.boot:spring-boot-configuration-processor", version.ref = "spring-boot" }
87+
spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "spring-boot" }
9388

9489
# Spring Cloud
9590
eureka-client = { module = "com.netflix.eureka:eureka-client", version.ref = "eureka-client" }

spring/tars-spring-boot-starter/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ plugins {
22
`java-library`
33
}
44

5-
description = "Tars Spring Boot Starter - Spring Boot 2.x starter for Tars"
5+
description = "Tars Spring Boot Starter - Spring Boot starter for Tars"
66

77
dependencies {
88
api(project(":spring:tars-spring"))
99

10-
implementation(libs.spring.boot.starter.v2)
10+
implementation(libs.spring.boot.starter)
1111
implementation(libs.spring.boot.starter.web)
12-
compileOnly(libs.spring.boot.configuration.processor.v2)
12+
compileOnly(libs.spring.boot.configuration.processor)
1313

1414
testImplementation(libs.junit)
1515
}

spring/tars-spring-cloud-starter/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies {
88
api(project(":spring:tars-spring"))
99
api(project(":tars-core"))
1010

11-
implementation(libs.spring.boot.starter.v2)
11+
implementation(libs.spring.boot.starter)
1212
implementation(libs.eureka.client)
1313
implementation(libs.spring.cloud.netflix.eureka.client)
1414
implementation(libs.spring.cloud.commons)

spring/tars-spring/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ dependencies {
88
api(project(":tars-core"))
99
api(project(":tars-netty"))
1010

11-
implementation(libs.spring.boot.starter.v1)
12-
compileOnly(libs.spring.boot.configuration.processor.v1)
11+
implementation(libs.spring.boot.starter)
12+
compileOnly(libs.spring.boot.configuration.processor)
1313

1414
testImplementation(libs.junit)
1515
}

0 commit comments

Comments
 (0)