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" 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"