From c6d045b74c1f76e6fd8286f28dcaee652f297343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 31 Jul 2025 17:18:30 +0200 Subject: [PATCH 1/2] HHH-19673 Apply the same baseline requirements (Java 17) as other modules to hibernate-gradle-plugin Otherwise the Java requirement on release will be whatever we use on CI, which currently is Java 21... --- tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle index 3bdf6480b1d4..90aab011352b 100644 --- a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle +++ b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle @@ -6,7 +6,7 @@ import org.apache.tools.ant.filters.ReplaceTokens plugins { id 'java-gradle-plugin' - id "local.module" + id "local.java-module" id "local.javadoc" id "local.code-quality" From fbc3ed0cc37a57b4f56c497bf4d55bd2f04c71d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 31 Jul 2025 18:40:12 +0200 Subject: [PATCH 2/2] HHH-19673 Do not run Jacoco in hibernate-gradle-plugin It's incompatible with TestKit: https://docs.gradle.org/8.14.3/userguide/configuration_cache.html#config_cache:not_yet_implemented:testkit_build_with_java_agent --- .../hibernate-integrationtest-java-modules.gradle | 5 +++++ .../src/main/groovy/local.java-module.gradle | 5 ----- .../src/main/groovy/local.publishing-java-module.gradle | 7 +++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle b/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle index 99e223ffe9d2..ee5022c60447 100644 --- a/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle +++ b/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle @@ -7,6 +7,11 @@ plugins { id "local.java-module" } +def skipJacoco = project.hasProperty('skipJacoco') ? project.getProperty('skipJacoco').toBoolean() : false +if (!skipJacoco) { + plugins.apply('jacoco') +} + description = 'Integration tests for running Hibernate ORM in the Java module path' // See https://docs.gradle.org/6.7.1/userguide/java_testing.html#blackbox_integration_testing diff --git a/local-build-plugins/src/main/groovy/local.java-module.gradle b/local-build-plugins/src/main/groovy/local.java-module.gradle index d462b56fe9ed..099502950d51 100644 --- a/local-build-plugins/src/main/groovy/local.java-module.gradle +++ b/local-build-plugins/src/main/groovy/local.java-module.gradle @@ -26,11 +26,6 @@ def jpaVersion = ormBuildDetails.jpaVersion def java9ModuleNameBase = project.name.startsWith( 'hibernate-' ) ? name.drop( 'hibernate-'.length() ): name def java9ModuleName = "org.hibernate.orm.$java9ModuleNameBase".replace('-','.') -def skipJacoco = project.hasProperty('skipJacoco') ? project.getProperty('skipJacoco').toBoolean() : false -if (!skipJacoco) { - plugins.apply('jacoco') -} - sourceSets { test { resources { diff --git a/local-build-plugins/src/main/groovy/local.publishing-java-module.gradle b/local-build-plugins/src/main/groovy/local.publishing-java-module.gradle index 09322c181c80..92ab6e2ca1f8 100644 --- a/local-build-plugins/src/main/groovy/local.publishing-java-module.gradle +++ b/local-build-plugins/src/main/groovy/local.publishing-java-module.gradle @@ -9,6 +9,13 @@ plugins { id "local.code-quality" } +// Ideally this should be in `local.java-module.gradle`, +// but we need to skip this in hibernate-gradle-plugin. +def skipJacoco = project.hasProperty('skipJacoco') ? project.getProperty('skipJacoco').toBoolean() : false +if (!skipJacoco) { + plugins.apply('jacoco') +} + configurations { javadocSources { description = "All Java sources for the project's Javadoc"