From 1c7caca0f570d033deb2a040a41c9597d0ceda8e Mon Sep 17 00:00:00 2001
From: Edoardo Comar <ecomar@uk.ibm.com>
Date: Thu, 7 May 2026 15:14:02 +0100
Subject: [PATCH 1/2] chore: update sonatype publishing plugin

based on
https://ralph.blog.imixs.com/2025/07/07/maven-sonatype-central-repository/
and
https://central.sonatype.org/publish/publish-portal-maven/#publishing-by-using-the-maven-plugin
and
https://central.sonatype.com/artifact/org.sonatype.central/central-publishing-maven-plugin

Signed-off-by: Edoardo Comar <ecomar@uk.ibm.com>
---
 mvn-settings.xml |  2 +-
 pom.xml          | 27 +++++++++++++--------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/mvn-settings.xml b/mvn-settings.xml
index 48357d9..6360b69 100644
--- a/mvn-settings.xml
+++ b/mvn-settings.xml
@@ -8,7 +8,7 @@
       <id>jfrog</id>
     </server>
     <server>
-      <id>ossrh</id>
+      <id>central</id>
       <username>${ossrh_username}</username>
       <password>${ossrh_password}</password>
     </server>
diff --git a/pom.xml b/pom.xml
index f6ea71c..ff46cc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
     <surefire-version>3.5.5</surefire-version>
     <jacoco-plugin-version>0.8.14</jacoco-plugin-version>
     <maven-deploy-plugin-version>3.1.4</maven-deploy-plugin-version>
-    <nexus-staging-plugin-version>1.7.0</nexus-staging-plugin-version>
+    <central-publishing-plugin-version>0.10.0</central-publishing-plugin-version>
     <maven-gpg-plugin-version>3.2.8</maven-gpg-plugin-version>
     <maven-source-plugin-version>3.4.0</maven-source-plugin-version>
     <maven-shade-plugin-version>3.6.2</maven-shade-plugin-version>
@@ -84,7 +84,7 @@
 
     <!-- >>> List each service's module here -->
     <module>modules/adminrest</module>
-    
+
     <module>modules/schemaregistry</module>
 
     <module>modules/oauth-client</module>
@@ -236,9 +236,9 @@
           <version>${maven-deploy-plugin-version}</version>
         </plugin>
         <plugin>
-          <groupId>org.sonatype.plugins</groupId>
-          <artifactId>nexus-staging-maven-plugin</artifactId>
-          <version>${nexus-staging-plugin-version}</version>
+          <groupId>org.sonatype.central</groupId>
+          <artifactId>central-publishing-maven-plugin</artifactId>
+          <version>${central-publishing-plugin-version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -508,23 +508,22 @@
           <!-- We don't deploy snapshot releases -->
         </snapshotRepository>
         <repository>
-          <!-- This is where the nexus staging plugin will publish artifacts -->
-          <id>ossrh</id>
-          <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+          <!-- This is where the central publishing plugin will publish artifacts -->
+          <id>central</id>
+          <url>https://central.sonatype.com/api/v1/publisher</url>
         </repository>
       </distributionManagement>
 
       <build>
         <plugins>
           <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <groupId>org.sonatype.central</groupId>
+            <artifactId>central-publishing-maven-plugin</artifactId>
             <extensions>true</extensions>
             <configuration>
-              <serverId>ossrh</serverId>
-              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-              <autoReleaseAfterClose>true</autoReleaseAfterClose>
-              <keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
+              <publishingServerId>central</publishingServerId>
+              <autoPublish>true</autoPublish>
+              <waitUntil>published</waitUntil>
             </configuration>
           </plugin>
           <plugin>

From 8aec4fb618d9555e9347674c709a7234aa85386d Mon Sep 17 00:00:00 2001
From: Edoardo Comar <edocomar@gmail.com>
Date: Thu, 7 May 2026 15:34:37 +0100
Subject: [PATCH 2/2] chore: clean up central-publishing-maven-plugin config

- Remove distributionManagement repository from central profile: the
  central-publishing-maven-plugin uploads via its own API (deployment
  extension), so the repository URL is unused dead config.
- Change waitUntil from 'published' to 'validated' to avoid blocking
  CI for the full Maven Central propagation window (10-30+ minutes).
  'validated' still fails the build on bundle validation errors.
- Restore unrelated whitespace.

Signed-off-by: Edoardo Comar <edocomar@gmail.com>
---
 pom.xml | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index ff46cc1..c5e3f4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
 
     <!-- >>> List each service's module here -->
     <module>modules/adminrest</module>
-
+    
     <module>modules/schemaregistry</module>
 
     <module>modules/oauth-client</module>
@@ -503,17 +503,6 @@
       <!-- For this profile, we'll get dependencies from maven central -->
       <repositories></repositories>
 
-      <distributionManagement>
-        <snapshotRepository>
-          <!-- We don't deploy snapshot releases -->
-        </snapshotRepository>
-        <repository>
-          <!-- This is where the central publishing plugin will publish artifacts -->
-          <id>central</id>
-          <url>https://central.sonatype.com/api/v1/publisher</url>
-        </repository>
-      </distributionManagement>
-
       <build>
         <plugins>
           <plugin>
@@ -523,7 +512,7 @@
             <configuration>
               <publishingServerId>central</publishingServerId>
               <autoPublish>true</autoPublish>
-              <waitUntil>published</waitUntil>
+              <waitUntil>validated</waitUntil>
             </configuration>
           </plugin>
           <plugin>