Merge branch '3.5.x' into 4.0.x

wilkinsona · wilkinsona · commit b6ba0cd14158 · 2026-01-20T18:02:33.000Z
Closes gh-48916
diff --git a/settings.gradle b/settings.gradle
@@ -38,7 +38,7 @@ pluginManagement {
 }
 
 plugins {
-	id "io.spring.develocity.conventions" version "0.0.22"
+	id "io.spring.develocity.conventions" version "0.0.25"
 	id "org.springframework.boot.cycle-detection"
 }
 
@@ -52,7 +52,6 @@ settings.gradle.projectsLoaded {
 			def toolchainVersion = settings.gradle.rootProject.findProperty('toolchainVersion')
 			if (toolchainVersion != null) {
 				value('Toolchain version', toolchainVersion)
-				tag("JDK-$toolchainVersion")
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ pluginManagement {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`plugins {`
`41`		`- id "io.spring.develocity.conventions" version "0.0.22"`
	`41`	`+ id "io.spring.develocity.conventions" version "0.0.25"`
`42`	`42`	`id "org.springframework.boot.cycle-detection"`
`43`	`43`	`}`
`44`	`44`
`@@ -52,7 +52,6 @@ settings.gradle.projectsLoaded {`
`52`	`52`	`def toolchainVersion = settings.gradle.rootProject.findProperty('toolchainVersion')`
`53`	`53`	`if (toolchainVersion != null) {`
`54`	`54`	`value('Toolchain version', toolchainVersion)`
`55`		`- tag("JDK-$toolchainVersion")`
`56`	`55`	`}`
`57`	`56`	`}`
`58`	`57`	`}`