Update gradle publish plugin

Signed-off-by: Max Lambrecht <maxlambrecht@gmail.com>

Author: maxlambrecht

.github/workflows/release_build.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
+  workflow_dispatch: {}
 
 env:
   REGISTRY: ghcr.io
@@ -13,23 +14,27 @@ jobs:
   publishToMaven:
     runs-on: ubuntu-latest
     env:
-      NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
-      NEXUS_TOKEN: ${{ secrets.NEXUS_TOKEN }}
-      PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }}
-      PGP_KEY_PASSPHRASE: ${{ secrets.PGP_KEY_PASSPHRASE }}
+      ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }}
+      ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
+
+      ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.PGP_PRIVATE_KEY }}
+      ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.PGP_PASSPHRASE }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
+
       - name: Set up JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ env.JAVA_VERSION }}
-          distribution: 'adopt'
-      - name: Publish to Nexus Maven Repository
-        run: ./gradlew publish
+          distribution: 'temurin'
+
+      - name: Publish to Maven Central
+        run: ./gradlew clean check publishToMavenCentral
 
   publishDockerImage:
     needs: publishToMaven
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     permissions:
       contents: read

build.gradle

@@ -2,6 +2,7 @@ plugins {
     id 'com.github.kt3k.coveralls' version '2.12.2'
     id 'com.google.osdetector' version '1.7.3'
     id 'jvm-test-suite'
+    id 'com.vanniktech.maven.publish' version '0.35.0'
 }
 
 allprojects {
@@ -28,14 +29,14 @@ subprojects {
     }
 
     apply plugin: 'java-library'
-    apply plugin: 'maven-publish'
-    apply plugin: 'signing'
+
+    // vanniktech plugin (maven-publish + signing)
+    apply plugin: 'com.vanniktech.maven.publish'
 
     java {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
 
-        withJavadocJar()
         withSourcesJar()
     }
 
@@ -44,65 +45,52 @@ subprojects {
         exclude "**/internal/**"
     }
 
-    publishing {
-        repositories {
-            maven {
-                credentials {
-                    username = project.properties["mavenDeployUser"] ?: System.getenv("NEXUS_USERNAME")
-                    password = project.properties["mavenDeployPassword"] ?: System.getenv("NEXUS_TOKEN")
+    // Central Portal + signing configuration
+    mavenPublishing {
+        // Credentials come from:
+        //   - ORG_GRADLE_PROJECT_mavenCentralUsername
+        //   - ORG_GRADLE_PROJECT_mavenCentralPassword
+        publishToMavenCentral()
+        signAllPublications()
+
+        pom {
+            name.set(project.name)
+            url.set('https://github.com/spiffe/java-spiffe')
+
+            // description is only available after evaluation
+            afterEvaluate {
+                if (project.description != null) {
+                    description.set(project.description)
                 }
-                url = project.properties["mavenDeployUrl"]
             }
-        }
 
-        publications {
-            mavenJava(MavenPublication) {
-                groupId project.group
-                version "${project.version}"
-                from components.java
-
-                pom {
-                    name = project.name
-                    artifactId = project.name
-                    url = 'https://github.com/spiffe/java-spiffe'
-                    afterEvaluate {
-                        // description is not available until evaluated.
-                        description = project.description
-                    }
+            scm {
+                connection = 'scm:git:https://github.com/spiffe/java-spiffe.git'
+                developerConnection = 'scm:git:git@github.com:spiffe/java-spiffe.git'
+                url = 'https://github.com/spiffe/java-spiffe'
+            }
 
-                    scm {
-                        connection = 'scm:git:https://github.com/spiffe/java-spiffe.git'
-                        developerConnection = 'scm:git:git@github.com:spiffe/java-spiffe.git'
-                        url = 'https://github.com/spiffe/java-spiffe'
-                    }
+            licenses {
+                license {
+                    name = 'The Apache License, Version 2.0'
+                    url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                }
+            }
 
-                    licenses {
-                        license {
-                            name = 'The Apache License, Version 2.0'
-                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                        }
-                    }
-                    developers {
-                        ['maxlambrecht:Max Lambrecht', 'rturner3:Ryan Turner'].each { devData ->
-                            developer {
-                                def devInfo = devData.split(':')
-                                id = devInfo[0]
-                                name = devInfo[1]
-                                url = 'https://github.com/' + devInfo[0]
-                                roles = ["Maintainer"]
-                            }
-                        }
+            developers {
+                ['maxlambrecht:Max Lambrecht', 'rturner3:Ryan Turner'].each { devData ->
+                    developer {
+                        def devInfo = devData.split(':')
+                        id = devInfo[0]
+                        name = devInfo[1]
+                        url = 'https://github.com/' + devInfo[0]
+                        roles = ["Maintainer"]
                     }
                 }
             }
         }
     }
 
-    signing {
-        useInMemoryPgpKeys(System.getenv('PGP_PRIVATE_KEY'), System.getenv('PGP_KEY_PASSPHRASE'))
-        sign publishing.publications.mavenJava
-    }
-
     dependencies {
         implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.19.0'
         implementation group: 'commons-validator', name: 'commons-validator', version: "1.10.0"
@@ -134,6 +122,14 @@ subprojects {
             }
         }
     }
+
+    afterEvaluate {
+        // Work around Gradle 8.14.x implicit-dependency validation:
+        // generateMetadataFileForMavenPublication must run after plainJavadocJar.
+        tasks.matching { it.name == "generateMetadataFileForMavenPublication" }.configureEach {
+            dependsOn(tasks.named("plainJavadocJar"))
+        }
+    }
 }
 
 task jacocoTestReport(type: JacocoReport) {

gradle.properties

@@ -1,2 +1 @@
-version=0.8.13
-mavenDeployUrl=https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2
+version=0.0.0-test

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists