From 1bda2f502ba7171e584a6c9f42acfcb28b079fe9 Mon Sep 17 00:00:00 2001
From: Jonas von Andrian <jonas.vonandrian@rohde-schwarz.com>
Date: Mon, 16 Mar 2026 08:42:55 +0100
Subject: [PATCH] Build: fix the publish step

---
 .github/workflows/publish.yml |  4 ++--
 build.gradle.kts              | 21 ++++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 824c88c..5c48ef7 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -33,5 +33,5 @@ jobs:
           GPG_SIGNING_KEY_ID: ${{ secrets.GPG_SIGNING_KEY_ID }}
           GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
           GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME || secrets.MAVEN_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD || secrets.MAVEN_PASSWORD }}
diff --git a/build.gradle.kts b/build.gradle.kts
index 0a73ef0..971f711 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -45,21 +45,24 @@ tasks.named<Test>("test") {
     useJUnitPlatform()
 }
 
-val mavenUsername = System.getenv("MAVEN_USERNAME")
-val mavenPassword = System.getenv("MAVEN_PASSWORD")
-if (mavenUsername != null && mavenPassword != null) {
+val sonatypeUsername = System.getenv("SONATYPE_USERNAME") ?: System.getenv("MAVEN_USERNAME")
+val sonatypePassword = System.getenv("SONATYPE_PASSWORD") ?: System.getenv("MAVEN_PASSWORD")
+if (sonatypeUsername != null && sonatypePassword != null) {
     nexusPublishing {
         repositories {
             sonatype {
-                nexusUrl = uri("https://s01.oss.sonatype.org/service/local/")
-                snapshotRepositoryUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-                username = mavenUsername
-                password = mavenPassword
+                // Route through Central Portal's OSSRH Staging API compatibility service.
+                nexusUrl = uri("https://ossrh-staging-api.central.sonatype.com/service/local/")
+                snapshotRepositoryUrl = uri("https://central.sonatype.com/repository/maven-snapshots/")
+                username = sonatypeUsername
+                password = sonatypePassword
             }
         }
     }
-} else if (mavenUsername != null || mavenPassword != null) {
-    throw GradleException("missing MAVEN_USERNAME or MAVEN_PASSWORD!")
+} else if (sonatypeUsername != null || sonatypePassword != null) {
+    throw GradleException(
+        "missing SONATYPE_USERNAME or SONATYPE_PASSWORD (legacy MAVEN_USERNAME/MAVEN_PASSWORD is still supported)!",
+    )
 }
 
 publishing {