[ACL-296] Move publishing to Maven Central (#367)

dili91 · web-flow · commit 580a2ce02e5c · 2025-08-07T11:06:55.000+02:00
diff --git a/.github/workflows/release-snapshot.yml b/.github/workflows/release-snapshot.yml
@@ -1,5 +1,7 @@
-# Reusable workflow to release to Nexus snapshot repository, referenced by workflow-*.yml pipelines.
-name: Release to Nexus snapshots repository
+# Reusable workflow to release to Maven Central, referenced by workflow-*.yml pipelines.
+name: Release to Maven Central
+permissions:
+  contents: read
 
 on:
   workflow_call:
@@ -13,14 +15,18 @@ on:
         required: true
         type: string
     secrets:
-      sonatype_username:
+      maven_central_username:
         required: true
-      sonatype_password:
+      maven_central_password:
+        required: true
+      maven_central_signing_key:
+        required: true
+      maven_central_signing_key_password:
         required: true
 
 jobs:
   release-snapshot:
-    name: Release to Nexus snapshots repository
+    name: Release to Maven Central
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -49,8 +55,10 @@ jobs:
           else
               echo "Project version ${{env.project_version_snapshot}} is not valid"; exit 1;
           fi
-      - name: Publish to Sonatype snapshot repository
-        run: ./gradlew -Pversion=${{env.project_version_snapshot}} publishToSonatype
+      - name: Publish snapshot to Maven Central
+        run: ./gradlew -Pversion=${{env.project_version_snapshot}} publishToMavenCentral
         env:
-          SONATYPE_USERNAME: ${{ secrets.sonatype_username }}
-          SONATYPE_PASSWORD: ${{ secrets.sonatype_password }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.maven_central_username }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.maven_central_password }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.maven_central_signing_key }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.maven_central_signing_key_password }}
diff --git a/.github/workflows/workflow-branch.yml b/.github/workflows/workflow-branch.yml
@@ -3,6 +3,10 @@
 # Build, test, run coverage analysis and release to Maven Central a final release.
 name: Workflow on internal branch, excluding main
 
+permissions:
+  contents: read
+  packages: write
+
 on:
   push:
     branches-ignore:
@@ -34,5 +38,7 @@ jobs:
       checkout_ref: ${{ github.ref }}
       project_version: ${{ needs.build-test-coverage.outputs.project_version }}
     secrets:
-      sonatype_username: ${{ secrets.SONATYPE_USERNAME }}
-      sonatype_password: ${{ secrets.SONATYPE_PASSWORD }}
+      maven_central_username: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+      maven_central_password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+      maven_central_signing_key: ${{ secrets.PGP_SIGNING_IN_MEMORY_KEY }}
+      maven_central_signing_key_password: ${{ secrets.PGP_SIGNING_IN_MEMORY_KEY_PASSWORD }}
diff --git a/.github/workflows/workflow-main.yml b/.github/workflows/workflow-main.yml
@@ -34,7 +34,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          checkout_ref: ${{ github.ref }}
+          ref: ${{ github.ref }}
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
@@ -55,10 +55,10 @@ jobs:
         with:
           tag_name: ${{ steps.create_tag.outputs.new_tag }}
           generate_release_notes: true
-      - name: Publish to Sonatype and Maven Central
-        run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
+      - name: Publish to Maven Central
+        run: ./gradlew publishToMavenCentral
         env:
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          SONATYPE_GPG_KEY: ${{ secrets.SONATYPE_GPG_KEY }}
-          SONATYPE_GPG_PASSPHRASE: ${{ secrets.SONATYPE_GPG_PASSPHRASE }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.PGP_SIGNING_IN_MEMORY_KEY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.PGP_SIGNING_IN_MEMORY_KEY_PASSWORD }}
diff --git a/.github/workflows/workflow-pr-fork.yml b/.github/workflows/workflow-pr-fork.yml
@@ -52,5 +52,7 @@ jobs:
       checkout_ref: ${{ github.event.pull_request.head.sha }}
       project_version: ${{ needs.build-test-coverage.outputs.project_version }}
     secrets:
-      sonatype_username: ${{ secrets.SONATYPE_USERNAME }}
-      sonatype_password: ${{ secrets.SONATYPE_PASSWORD }}
+      maven_central_username: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+      maven_central_password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+      maven_central_signing_key: ${{ secrets.PGP_SIGNING_IN_MEMORY_KEY }}
+      maven_central_signing_key_password: ${{ secrets.PGP_SIGNING_IN_MEMORY_KEY_PASSWORD }}
diff --git a/README.md b/README.md
@@ -37,9 +37,9 @@ To use on of those release with Gradle, make sure you have the following reposit
 repositories {
     // ... all your existing repos here
     
-    maven{
-        url 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
-    }   
+    maven {
+        url = 'https://central.sonatype.com/repository/maven-snapshots/'
+    }
 }
 ``` 
 
diff --git a/build.gradle b/build.gradle
@@ -1,20 +1,19 @@
+import com.vanniktech.maven.publish.JavaLibrary
+import com.vanniktech.maven.publish.JavadocJar
+
 plugins {
     id 'java-library'
     // to unleash the lombok magic
     id "io.freefair.lombok" version "8.13.1"
     // to make our tests output more fancy
     id 'com.adarshr.test-logger' version '4.0.0'
-    // to publish packages
-    id 'maven-publish'
     // code linting
     id "com.diffplug.spotless" version "7.0.3"
     //  test coverage
     id 'jacoco'
     id 'com.github.kt3k.coveralls' version '2.12.2'
-    // signing
-    id "signing"
-    // nexus publishing
-    id "io.github.gradle-nexus.publish-plugin"  version "2.0.0"
+    // maven central publishing
+    id "com.vanniktech.maven.publish" version "0.34.0"
 }
 
 compileJava {
@@ -28,7 +27,8 @@ spotless {
     }
 }
 
-task createProperties(dependsOn: processResources) {
+tasks.register('createProperties') {
+    dependsOn processResources
     doLast {
         file("${layout.buildDirectory.get()}/resources/main/truelayer-java.version.properties").withWriter { w ->
             Properties p = new Properties()
@@ -147,66 +147,45 @@ jacocoTestReport {
     }
 }
 
-task sourcesJar(type: Jar) {
+tasks.register('sourcesJar', Jar) {
     from sourceSets.main.allJava
     archiveClassifier = 'sources'
 }
 
-task javadocJar(type: Jar) {
+tasks.register('javadocJar', Jar) {
     from javadoc
     archiveClassifier = 'javadoc'
 }
 
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            from(components.java)
-            artifact sourcesJar
-            artifact javadocJar
-
-            pom {
-                name = project_name
-                packaging = 'jar'
-                description = project_description
-                url = project_url
-                scm {
-                    connection = project_scm
-                    developerConnection = project_scm
-                    url = project_url
-                }
-                licenses {
-                    license {
-                        name = project_license_name
-                        url = project_license_url
-                    }
-                }
-                developers {
-                    developer {
-                        id = project_developer
-                        name = project_developer
-                    }
-                }
-            }
-        }
-    }
-}
+mavenPublishing {
+    publishToMavenCentral(true)
+    signAllPublications()
 
-ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
-signing {
-    def signingKey = System.getenv('SONATYPE_GPG_KEY')
-    def signingPassword = System.getenv('SONATYPE_GPG_PASSPHRASE')
-    useInMemoryPgpKeys(signingKey, signingPassword)
-    sign publishing.publications.mavenJava
-    required { isReleaseVersion && gradle.taskGraph.hasTask("publish") }
-}
+    // Use the sources and javadoc jars
+    configure(new JavaLibrary(new JavadocJar.Javadoc(), true))
 
-nexusPublishing {
-    repositories {
-        sonatype {
-            nexusUrl = uri(sonatype_repository_url)
-            snapshotRepositoryUrl = uri(sonatype_snapshot_repository_url)
-            username = System.getenv("SONATYPE_USERNAME")
-            password = System.getenv("SONATYPE_PASSWORD")
+    pom {
+        name = project_name
+        packaging = 'jar'
+        description = project_description
+        url = project_url
+        scm {
+            connection = project_scm
+            url = project_url
+        }
+        licenses {
+            license {
+                name = project_license_name
+                url = project_license_url
+                distribution = project_license_url
+            }
+        }
+        developers {
+            developer {
+                id = developer_name
+                name = developer_name
+                url = developer_url
+            }
         }
     }
 }
diff --git a/examples/quarkus-mvc/src/main/java/com/truelayer/quarkusmvc/services/DonationService.java b/examples/quarkus-mvc/src/main/java/com/truelayer/quarkusmvc/services/DonationService.java
@@ -63,10 +63,10 @@ public URI createDonationLink(DonationRequest req) {
             throw new RuntimeException(String.format("create payment error: %s", paymentResponse.getError()));
         }
 
-        return tlClient.hpp()
-                .getHostedPaymentPageLink(
-                        paymentResponse.getData().getId(),
-                        paymentResponse.getData().getResourceToken(),
-                        URI.create("http://localhost:8080/donations/callback"));
+        return tlClient.hppLinkBuilder()
+                .resourceId(paymentResponse.getData().getId())
+                .resourceToken(paymentResponse.getData().getResourceToken())
+                .returnUri(URI.create("http://localhost:8080/donations/callback"))
+                .build();
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,15 +1,14 @@
 # Main properties
 group=com.truelayer
 archivesBaseName=truelayer-java
-version=17.3.0
+version=17.3.1
 
 # Artifacts properties
-sonatype_repository_url=https://s01.oss.sonatype.org/service/local/
-sonatype_snapshot_repository_url=https://s01.oss.sonatype.org/content/repositories/snapshots/
 project_name=TrueLayer Java
 project_description=TrueLayer Java SDK for https://truelayer.com
 project_url=https://github.com/TrueLayer/truelayer-java
+project_scm=scm:git:https://github.com/TrueLayer/truelayer-java.git
 project_license_url=https://raw.githubusercontent.com/TrueLayer/truelayer-java/main/LICENSE
 project_license_name=MIT License
-project_developer=truelayer
-project_scm=scm:git:https://github.com/TrueLayer/truelayer-java.git
+developer_name=truelayer
+developer_url=https://github.com/TrueLayer

Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,10 @@ public URI createDonationLink(DonationRequest req) {`
`63`	`63`	`throw new RuntimeException(String.format("create payment error: %s", paymentResponse.getError()));`
`64`	`64`	`}`
`65`	`65`
`66`		`- return tlClient.hpp()`
`67`		`- .getHostedPaymentPageLink(`
`68`		`- paymentResponse.getData().getId(),`
`69`		`- paymentResponse.getData().getResourceToken(),`
`70`		`- URI.create("http://localhost:8080/donations/callback"));`
	`66`	`+ return tlClient.hppLinkBuilder()`
	`67`	`+ .resourceId(paymentResponse.getData().getId())`
	`68`	`+ .resourceToken(paymentResponse.getData().getResourceToken())`
	`69`	`+ .returnUri(URI.create("http://localhost:8080/donations/callback"))`
	`70`	`+ .build();`
`71`	`71`	`}`
`72`	`72`	`}`