Tag the JDK used to run tests, not the one used to run Gradle

Author: yrodiere

gradle/gradle-enterprise.gradle

@@ -46,7 +46,7 @@ gradleEnterprise {
 
         uploadInBackground = !settings.ext.isCiEnvironment
 
-        tag "JDK ${JavaVersion.current().toString()}"
+        tag "jdk-${extensions.jdkVersions.test.launcher}"
         tag extensions.db
         value 'database', extensions.db
         if ( extensions.hasProperty( 'ci.node' ) ) {

local-build-plugins/build.gradle

@@ -60,6 +60,10 @@ gradlePlugin {
 			id = 'org.hibernate.orm.build.env-settings'
 			implementationClass = 'org.hibernate.orm.env.EnvironmentSettingsPlugin'
 		}
+		jdkVersionSettings {
+			id = 'org.hibernate.orm.build.jdks-settings'
+			implementationClass = 'org.hibernate.orm.toolchains.JdkVersionSettingsPlugin'
+		}
 		envProject {
 			id = 'org.hibernate.orm.build.env-project'
 			implementationClass = 'org.hibernate.orm.env.EnvironmentProjectPlugin'

local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionSettingsPlugin.java

@@ -49,6 +49,7 @@ public void apply(Settings settings) {
 		);
 
 		settings.getGradle().getExtensions().add( JdkVersionConfig.DSL_NAME, jdkVersionConfig );
+		settings.getExtensions().add( JdkVersionConfig.DSL_NAME, jdkVersionConfig );
 		JdkVersionsLogging.logVersions( jdkVersionConfig );
 	}
 

settings.gradle

@@ -19,6 +19,7 @@ pluginManagement {
 
 plugins {
     id 'org.hibernate.orm.build.env-settings'
+    id 'org.hibernate.orm.build.jdks-settings'
     id 'com.gradle.enterprise' version '3.16.2'
     id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.13'
 }