Consider toolchainVersion project property when tagging JDK version

Closes gh-22
spring-io · Apr 14, 2021 · 2dd3b57 · 2dd3b57
1 parent e503656
commit 2dd3b57
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/...se-conventions-core/src/main/java/io/spring/ge/conventions/core/BuildScanConventions.java b/...se-conventions-core/src/main/java/io/spring/ge/conventions/core/BuildScanConventions.java
@@ -102,7 +102,11 @@ private boolean isJenkins() {
 	}
 
 	private void tagJdk(ConfigurableBuildScan buildScan) {
-		buildScan.tag("JDK-" + System.getProperty("java.specification.version"));
+		buildScan.tag("JDK-" + getJdkVersion());
+	}
+
+	protected String getJdkVersion() {
+		return System.getProperty("java.specification.version");
 	}
 
 	private void tagOperatingSystem(ConfigurableBuildScan buildScan) {

diff --git a/...ugin/src/main/java/io/spring/ge/conventions/gradle/GradleEnterpriseConventionsPlugin.java b/...ugin/src/main/java/io/spring/ge/conventions/gradle/GradleEnterpriseConventionsPlugin.java
@@ -81,10 +81,26 @@ private void configureBuildScanConventions(BuildScanExtension buildScan, StartPa
 					new WorkingDirectoryProcessOperations(this.processOperations, rootDir));
 			GradleConfigurableBuildScan configurableBuildScan = new GradleConfigurableBuildScan(buildScan);
 			if (startParameter.isBuildScan()) {
-				new AnonymousPublicationBuildScanConventions(processRunner).execute(configurableBuildScan);
+				new AnonymousPublicationBuildScanConventions(processRunner) {
+
+					@Override
+					protected String getJdkVersion() {
+						String toolchainVersion = startParameter.getProjectProperties().get("toolchainVersion");
+						return (toolchainVersion != null) ? toolchainVersion : super.getJdkVersion();
+					}
+
+				}.execute(configurableBuildScan);
 			}
 			else {
-				new BuildScanConventions(processRunner).execute(configurableBuildScan);
+				new BuildScanConventions(processRunner) {
+
+					@Override
+					protected String getJdkVersion() {
+						String toolchainVersion = startParameter.getProjectProperties().get("toolchainVersion");
+						return (toolchainVersion != null) ? toolchainVersion : super.getJdkVersion();
+					}
+
+				}.execute(configurableBuildScan);
 			}
 		}
 	}