From 4ba711aa6ed468a4a6ed89262d9e277a857866d8 Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Fri, 23 Sep 2022 10:56:58 +0200 Subject: [PATCH] HHH-15534 Fix publishing of the hibernate-gradle-plugin --- gradle/published-java-module.gradle | 1 + .../hibernate-gradle-plugin.gradle | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gradle/published-java-module.gradle b/gradle/published-java-module.gradle index 351df160d5..b9ea71617b 100644 --- a/gradle/published-java-module.gradle +++ b/gradle/published-java-module.gradle @@ -11,6 +11,7 @@ apply from: rootProject.file( 'gradle/publishing-pom.gradle' ) apply plugin: 'signing' +// Make sure that the publishReleaseArtifacts task of the release module runs the release task of this sub module tasks.getByPath( ':release:publishReleaseArtifacts' ).dependsOn tasks.release configurations { diff --git a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle index 9a24780bcd..f7c9760e62 100644 --- a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle +++ b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle @@ -87,6 +87,9 @@ tasks.release.dependsOn tasks.publishPlugins // local publishing (SNAPSHOT testing) tasks.publish.dependsOn tasks.publishPlugins +// Make sure that the publishReleaseArtifacts task of the release module runs the release task of this sub module +tasks.getByPath( ':release:publishReleaseArtifacts' ).dependsOn tasks.release + // local publishing (SNAPSHOT testing) publishing { repositories { @@ -145,10 +148,8 @@ tasks.publishPlugins.enabled !project.ormVersion.isSnapshot gradle.taskGraph.whenReady { tg -> if ( tg.hasTask( project.tasks.publishPlugins ) && project.tasks.publishPlugins.enabled ) { // look for sys-prop or env-var overrides of the tokens used for publishing - if ( System.properties.containsKey( 'gradle.publish.key' ) - || System.properties.containsKey( 'gradle.publish.secret' ) - || System.getenv().containsKey( 'GRADLE_PUBLISH_KEY' ) - || System.getenv().containsKey( 'GRADLE_PUBLISH_SECRET' ) ) { + if ( project.properties.containsKey( 'gradle.publish.key' ) + || project.properties.containsKey( 'gradle.publish.secret' ) ) { // nothing to do - already explicitly set } else {