Merge branch '2.4.x'

settings.gradle

@@ -31,12 +31,10 @@ rootProject.name="spring-boot-build"
 settings.gradle.projectsLoaded {
 	gradleEnterprise {
 		buildScan {
-			if (settings.gradle.rootProject.hasProperty('toolchainVersion')) {
+			def toolchainVersion = settings.gradle.rootProject.findProperty('toolchainVersion')
-				def toolchainVersion = settings.gradle.rootProject.findProperty('toolchainVersion')
+			if (toolchainVersion != null) {
-				if (toolchainVersion != null) {
+				value('Toolchain version', toolchainVersion)
-					value('Toolchain version', toolchainVersion)
+				tag("JDK-$toolchainVersion")
-					tag("JDK-$toolchainVersion")
-				}
 			}
 
 			settings.gradle.rootProject.getBuildDir().mkdirs()