Merge branch '3.4.x' into 3.5.x

wilkinsona · wilkinsona · commit b1574da542bf · 2025-06-24T11:52:13.000+01:00
Closes gh-46188
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/getting-started/apply-plugin-commercial.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/getting-started/apply-plugin-commercial.gradle
@@ -15,5 +15,5 @@
  */
 
 plugins {
-	id 'org.springframework.boot' version '{gradle-project-version}'
+	id 'org.springframework.boot' version '{version-spring-boot}'
 }
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/getting-started/apply-plugin-commercial.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/getting-started/apply-plugin-commercial.gradle.kts
@@ -1,3 +1,3 @@
 plugins {
-	id("org.springframework.boot") version "{gradle-project-version}"
+	id("org.springframework.boot") version "{version-spring-boot}"
 }
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/depend-on-plugin-commercial.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/depend-on-plugin-commercial.gradle
@@ -15,5 +15,5 @@
  */
 
 plugins {
-	id 'org.springframework.boot' version '{gradle-project-version}' apply false
+	id 'org.springframework.boot' version '{version-spring-boot}' apply false
 }
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/depend-on-plugin-commercial.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/depend-on-plugin-commercial.gradle.kts
@@ -1,3 +1,3 @@
 plugins {
-	id("org.springframework.boot") version "{gradle-project-version}" apply false
+	id("org.springframework.boot") version "{version-spring-boot}" apply false
 }

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`plugins {`
`18`		`- id 'org.springframework.boot' version '{gradle-project-version}'`
	`18`	`+ id 'org.springframework.boot' version '{version-spring-boot}'`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`plugins {`
`2`		`- id("org.springframework.boot") version "{gradle-project-version}"`
	`2`	`+ id("org.springframework.boot") version "{version-spring-boot}"`
`3`	`3`	`}`