From 3f50b0204997fe2b334b06adb4fff9dc6306e82b Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Sat, 6 Mar 2021 10:28:32 +0000
Subject: [PATCH] Tag build scans with JDK-${toolchainVersion}

Closes gh-25525
---
 settings.gradle | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 301786b021..6499f0eefb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -32,7 +32,11 @@ settings.gradle.projectsLoaded {
 	gradleEnterprise {
 		buildScan {
 			if (settings.gradle.rootProject.hasProperty('toolchainVersion')) {
-				value('Toolchain Version', settings.gradle.rootProject.getProperty('toolchainVersion'))
+				def toolchainVersion = settings.gradle.rootProject.findProperty('toolchainVersion')
+				if (toolchainVersion != null) {
+					value('Toolchain version', toolchainVersion)
+					tag("JDK-$toolchainVersion")
+				}
 			}
 
 			settings.gradle.rootProject.getBuildDir().mkdirs()