[#687] Release via OSSRH

Author: DavideD

.github/workflows/build.yml

@@ -218,10 +218,8 @@ jobs:
             IdentityFile ~/.ssh/id_rsa_hibernate.org
     - name: Publish documentation on Hibernate.org
       run: ./gradlew publishDocumentation -PdocPublishBranch=production
-    - name: Publish release to Bintray
+    - name: Publish artifacts to OSSRH, close repository and release
       env:
-        ORG_GRADLE_PROJECT_bintrayUser: ${{ secrets.BINTRAY_USER }}
-        ORG_GRADLE_PROJECT_bintrayKey: ${{ secrets.BINTRAY_KEY }}
         ORG_GRADLE_PROJECT_sonatypeOssrhUser: ${{ secrets.SONATYPE_OSSRH_USER }}
         ORG_GRADLE_PROJECT_sonatypeOssrhPassword: ${{ secrets.SONATYPE_OSSRH_PASSWORD }}
-      run: ./gradlew bintrayUpload bintrayPublish
+      run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository

build.gradle

@@ -4,12 +4,22 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'com.diffplug.gradle.spotless' version '4.0.1'
-    id 'nu.studer.credentials' version '2.1' apply false
-    id 'com.jfrog.bintray' version '1.8.5' apply false
+    id 'nu.studer.credentials' version '2.1'
     id 'org.asciidoctor.convert' version '1.5.7' apply false
+    id 'io.github.gradle-nexus.publish-plugin' version '1.0.0'
 }
 
 ext {
+    if (!project.hasProperty('sonatypeOssrhUser')) {
+        sonatypeOssrhUser = credentials.sonatypeOssrhUser
+    }
+    if (!project.hasProperty('sonatypeOssrhPassword')) {
+        sonatypeOssrhPassword = credentials.sonatypeOssrhPassword
+    }
+}
+
+ext {
+    projectGroup = 'org.hibernate.reactive'
     projectVersionFile = file( "${rootProject.projectDir}/gradle/version.properties" )
     projectVersion = Version.parseProjectVersion( readVersionFromProperties( projectVersionFile ) )
 
@@ -21,12 +31,16 @@ ext {
     }
 }
 
+// nexusPublishing uses group and version
+// as defaults
+group = projectGroup
+version = projectVersion
+
 // Versions which need to be aligned across modules; this also
 // allows overriding the build using a parameter, which can be
 // useful to monitor compatibility for upcoming versions on CI:
 //
 // ./gradlew clean build -PhibernateOrmVersion=5.4.30-SNAPSHOT
-
 ext {
     if ( !project.hasProperty('hibernateOrmVersion') ) {
         hibernateOrmVersion = '5.4.30.Final'
@@ -62,12 +76,24 @@ ext {
 
     logger.lifecycle "Hibernate ORM Version: " + project.hibernateOrmVersion
     logger.lifecycle "Vert.x Version: " + project.vertxVersion
+    logger.lifecycle "Hibernate Reactive: " + project.version
+}
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            username = project.sonatypeOssrhUser
+            password = project.sonatypeOssrhPassword
+        }
+    }
 }
 
 subprojects {
     apply plugin: 'java-library'
     apply plugin: 'com.diffplug.gradle.spotless'
-    group = 'org.hibernate.reactive'
+
+    // FIXME: Also setting the group and version here otherwise not all tasks will find them
+    group = projectGroup
     version = projectVersion
 
     repositories {

documentation/build.gradle

@@ -133,6 +133,8 @@ task renderReferenceDocumentation(type: AsciidoctorTask, group: 'Documentation')
 task assembleDocumentation(dependsOn: [aggregateJavadocs, renderReferenceDocumentation]) {
 	group 'Documentation'
 	description 'Grouping task for performing all documentation building tasks'
+
+	logger.lifecycle "Documentation groupId: '" + project.group + "', version: '" + project.version + "'"
 }
 
 assemble.dependsOn assembleDocumentation

publish.gradle

@@ -1,10 +1,11 @@
 apply plugin: 'maven-publish'
 apply plugin: 'nu.studer.credentials'
-apply plugin: 'com.jfrog.bintray'
 
 // To publish snapshots:
 //  ./gradlew publish -PjbossNexusUser="<YOUR USERNAME>" -PjbossNexusPassword="<YOUR PASSWORD>"
 // To release, see task ciRelease in release/build.gradle
+// To publish on Sonatype (Maven Central):
+// ./gradlew publishToSonatype closeAndReleaseStagingRepository -PsonatypeOssrhUser="<YOUR USERNAME>" -PsonatypeOssrhPassword="<YOUR PASSWORD>"
 
 ext {
     // Credentials can be specified on the command-line using project properties,
@@ -17,18 +18,6 @@ ext {
     if (!project.hasProperty('jbossNexusPassword')) {
         jbossNexusPassword = credentials.jbossNexusPassword
     }
-    if (!project.hasProperty('bintrayUser')) {
-        bintrayUser = credentials.bintrayUser
-    }
-    if (!project.hasProperty('bintrayKey')) {
-        bintrayKey = credentials.bintrayKey
-    }
-    if (!project.hasProperty('sonatypeOssrhUser')) {
-        sonatypeOssrhUser = credentials.sonatypeOssrhUser
-    }
-    if (!project.hasProperty('sonatypeOssrhPassword')) {
-        sonatypeOssrhPassword = credentials.sonatypeOssrhPassword
-    }
 }
 
 task sourcesJar(type: Jar) {
@@ -77,6 +66,8 @@ publishing {
         }
     }
     publications {
+        logger.lifecycle "Publishing groupId: '" + project.group + "', version: '" + project.version + "'"
+
         publishedArtifacts(MavenPublication) {
             groupId = project.group
             version = project.version
@@ -120,32 +111,3 @@ publishing {
         }
     }
 }
-
-bintray {
-    user = project.bintrayUser
-    key = project.bintrayKey
-
-    publications = ['publishedArtifacts']
-
-    pkg {
-        userOrg = 'hibernate'
-        repo = 'artifacts'
-        name = 'hibernate-reactive'
-
-        publish = true
-
-        version {
-            name = project.version
-            released = new Date()
-            vcsTag = project.version
-            gpg {
-                sign = true
-            }
-            mavenCentralSync {
-                sync = true
-                user = project.sonatypeOssrhUser
-                password = project.sonatypeOssrhPassword
-            }
-        }
-    }
-}