Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Yoann Rodière 2024-03-21 19:00:37 +01:00
parent 1cac1d5bc9
commit 5b27fa0464
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/gradle-enterprise.gradle
View File

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

4
local-build-plugins/build.gradle
View File

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

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

@ -49,6 +49,7 @@ public class JdkVersionSettingsPlugin implements Plugin<Settings> {
); );
settings.getGradle().getExtensions().add( JdkVersionConfig.DSL_NAME, jdkVersionConfig ); settings.getGradle().getExtensions().add( JdkVersionConfig.DSL_NAME, jdkVersionConfig );
settings.getExtensions().add( JdkVersionConfig.DSL_NAME, jdkVersionConfig );
JdkVersionsLogging.logVersions( jdkVersionConfig ); JdkVersionsLogging.logVersions( jdkVersionConfig );
} }

1
settings.gradle
View File

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