Publish to Sonatype

connected: #38

Author: slawekjaranowski

.github/workflows/ci.yml

@@ -68,7 +68,7 @@ jobs:
         distribution: 'adopt'
 
     - name: 3. Build on ${{ matrix.os }} with Java ${{ matrix.java }}
-      run: ./gradlew build bintrayUpload idea -PbintrayDryRun
+      run: ./gradlew build idea
 
   #
   # Release job, only for pushes to the main development branch
@@ -97,15 +97,10 @@ jobs:
         distribution: 'adopt'
 
     - name: Build and publish to Bintray/MavenCentral
-      run: |
-        # Print output every minute to avoid Github Actions timeout
-        while sleep 1m; do echo "=====[ $SECONDS seconds elapsed -- still running ]====="; done &
-        ./gradlew bintrayUpload githubRelease
-        # Killing background sleep loop
-        kill %1
+      run: ./gradlew publishToSonatype closeAndReleaseStagingRepository githubRelease
       env:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-        BINTRAY_API_KEY: ${{secrets.BINTRAY_API_KEY}}
         NEXUS_TOKEN_USER: ${{secrets.NEXUS_TOKEN_USER}}
         NEXUS_TOKEN_PWD: ${{secrets.NEXUS_TOKEN_PWD}}
-
+        PGP_KEY: ${{secrets.PGP_KEY}}
+        PGP_PWD: ${{secrets.PGP_PWD}}

README.md

@@ -5,7 +5,6 @@ Mockito utility classes for easy integration with TestNG
 [![CI](https://github.com/mockito/mockito-testng/workflows/CI/badge.svg)](https://github.com/mockito/mockito-testng/actions?query=workflow%3ACI)
 
 [![Maven Central](https://img.shields.io/maven-central/v/org.mockito/mockito-testng.svg)](https://search.maven.org/artifact/org.mockito/mockito-testng/)
-[![Bintray](https://img.shields.io/bintray/v/mockito/maven/mockito-testng)](https://bintray.com/mockito/maven/mockito-testng/_latestVersion)
 
 ## Installation
 

build.gradle

@@ -5,9 +5,9 @@ buildscript {
         }
     }
     dependencies {
-        classpath "org.shipkit:shipkit-auto-version:1.+"
-        classpath "org.shipkit:shipkit-changelog:1.+"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.+"
+        classpath "io.github.gradle-nexus:publish-plugin:1.1.0"
+        classpath 'org.shipkit:shipkit-changelog:1.1.15'
+        classpath 'org.shipkit:shipkit-auto-version:1.1.11'
     }
 }
 

gradle/java-publication.gradle

@@ -84,43 +84,24 @@ publishing {
 //fleshes out problems with Maven pom generation when building
 tasks.build.dependsOn("publishJavaLibraryPublicationToMavenLocal")
 
-//Bintray Gradle plugin configuration (https://github.com/bintray/gradle-bintray-plugin)
-//Plugin jars are added to the buildscript classpath in the root build.gradle file
-apply plugin: "com.jfrog.bintray"
-
-bintray {
-    //We need to use some user id here, because the Bintray key is associated with the user
-    //However, any user id is good, so longer the user has necessary privileges to the repository
-    user = 'szczepiq' //https://bintray.com/szczepiq
-    key = System.getenv('BINTRAY_API_KEY')
-    publish = true //can be changed to 'false' for testing
-    dryRun = project.hasProperty("bintrayDryRun")
-
-    // allow override in order to possibility re-run job if something failed
-    // especially Maven Central sync
-    // https://github.com/mockito/mockito-testng/issues/26
-    override = true
-
-    publications = ['javaLibrary']
-
-    pkg {
-        repo = 'maven' //https://bintray.com/mockito/maven
-        userOrg = 'mockito' //https://bintray.com/mockito
-
-        name = "mockito-testng"
-
-        licenses = ['MIT']
-        labels = ['testng', 'mockito']
-        vcsUrl = "https://github.com/mockito/mockito-testng.git"
+apply plugin: 'signing' //https://docs.gradle.org/current/userguide/signing_plugin.html
+signing {
+    if (System.getenv('PGP_KEY')) {
+        useInMemoryPgpKeys(System.getenv('PGP_KEY'), System.getenv('PGP_PWD'))
+        sign publishing.publications.javaLibrary
+    }
+}
 
-        version {
-            name = project.version
-            vcsTag = "v$project.version"
+apply plugin: 'io.github.gradle-nexus.publish-plugin'
+nexusPublishing {
+    repositories {
+        if (System.getenv('NEXUS_TOKEN_PWD')) {
+            sonatype {
+                // Publishing to: https://s01.oss.sonatype.org (faster instance)
+                nexusUrl = uri('https://s01.oss.sonatype.org/service/local/')
+                snapshotRepositoryUrl = uri('https://s01.oss.sonatype.org/content/repositories/snapshots/')
 
-            //Notable versions are automatically synced to Maven Central repository (https://oss.sonatype.org/)
-            mavenCentralSync {
-                sync = true
-                user = System.getenv('NEXUS_TOKEN_USER')
+                username = System.getenv('NEXUS_TOKEN_USER')
                 password = System.getenv('NEXUS_TOKEN_PWD')
             }
         }

version.properties

@@ -1 +1 @@
-version=0.3.*
+version=0.4.*