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

HHH-15534 Fix publishing of the hibernate-gradle-plugin

This commit is contained in:
Christian Beikov 2022-09-23 10:56:58 +02:00
parent f935eb2430
commit 249dfd0d12
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gradle/published-java-module.gradle
View File

@ -11,6 +11,7 @@ apply from: rootProject.file( 'gradle/publishing-pom.gradle' )
apply plugin: 'signing' 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 tasks.getByPath( ':release:publishReleaseArtifacts' ).dependsOn tasks.release
configurations { configurations {

9
tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
View File

@ -87,6 +87,9 @@ tasks.release.dependsOn tasks.publishPlugins
// local publishing (SNAPSHOT testing) // local publishing (SNAPSHOT testing)
tasks.publish.dependsOn tasks.publishPlugins 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) // local publishing (SNAPSHOT testing)
publishing { publishing {
repositories { repositories {
@ -145,10 +148,8 @@ tasks.publishPlugins.enabled !project.ormVersion.isSnapshot
gradle.taskGraph.whenReady { tg -> gradle.taskGraph.whenReady { tg ->
if ( tg.hasTask( project.tasks.publishPlugins ) && project.tasks.publishPlugins.enabled ) { if ( tg.hasTask( project.tasks.publishPlugins ) && project.tasks.publishPlugins.enabled ) {
// look for sys-prop or env-var overrides of the tokens used for publishing // look for sys-prop or env-var overrides of the tokens used for publishing
if ( System.properties.containsKey( 'gradle.publish.key' ) if ( project.properties.containsKey( 'gradle.publish.key' )
|| System.properties.containsKey( 'gradle.publish.secret' ) || project.properties.containsKey( 'gradle.publish.secret' ) ) {
|| System.getenv().containsKey( 'GRADLE_PUBLISH_KEY' )
|| System.getenv().containsKey( 'GRADLE_PUBLISH_SECRET' ) ) {
// nothing to do - already explicitly set // nothing to do - already explicitly set
} }
else { else {