From 9f6a1cc0de53c8c4acf96799124f803cc0dc4706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Mart=C3=ADnez=20Kirsten?=
 <pablo.martinez@imatia.com>
Date: Mon, 12 May 2025 15:07:20 +0200
Subject: [PATCH] Update GitHub Actions and pom.xml for deploying with Maven
 Central Plugin instead of OSSRH

---
 .../workflows/deploy-mvn-central-release.yml  |  4 +-
 .../workflows/deploy-mvn-central-snapshot.yml |  4 +-
 pom.xml                                       | 38 +++++--------------
 3 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/deploy-mvn-central-release.yml b/.github/workflows/deploy-mvn-central-release.yml
index 9eafd5d..584216f 100644
--- a/.github/workflows/deploy-mvn-central-release.yml
+++ b/.github/workflows/deploy-mvn-central-release.yml
@@ -33,11 +33,11 @@ jobs:
           ref: ${{ env.BRANCH }}
           fetch-depth: 0
       - name: Setup Java JDK and Maven
-        uses: ontimize/setup-java-maven-gitAction@v4
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
-          server-id: ossrh
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_CENTRAL_TOKEN
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
diff --git a/.github/workflows/deploy-mvn-central-snapshot.yml b/.github/workflows/deploy-mvn-central-snapshot.yml
index d9b330c..737464b 100644
--- a/.github/workflows/deploy-mvn-central-snapshot.yml
+++ b/.github/workflows/deploy-mvn-central-snapshot.yml
@@ -15,11 +15,11 @@ jobs:
       - name: Checkout repository code
         uses: actions/checkout@v4
       - name: Setup Java JDK and Maven
-        uses: ontimize/setup-java-maven-gitAction@v4
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
-          server-id: ossrh
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_CENTRAL_TOKEN
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
diff --git a/pom.xml b/pom.xml
index dfa04c8..464a77e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,17 +43,6 @@
         <url>https://github.com/ontimize/ontimize-jee-sdms.git/tree/main</url>
     </scm>
 
-    <distributionManagement>
-        <repository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
     <modules>
         <module>ontimize-jee-sdms-common</module>
         <module>ontimize-jee-sdms-event</module>
@@ -81,17 +70,16 @@
         <!-- PLUGINS -->
         <compiler.plugin.version>3.8.1</compiler.plugin.version>
         <dependency-maven-plugin.version>1.0</dependency-maven-plugin.version>
-        <deploy.plugin.version>3.0.0-M1</deploy.plugin.version>
         <ear.plugin.version>2.8</ear.plugin.version>
         <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
         <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
-        <nexus-staging-maven-plugin.version>1.6.7</nexus-staging-maven-plugin.version>
         <resources.plugin.version>3.2.0</resources.plugin.version>
         <source.plugin.version>3.2.1</source.plugin.version>
         <war.plugin.version>2.4</war.plugin.version>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
         <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
+        <central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
     </properties>
 
     <dependencyManagement>
@@ -192,11 +180,6 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>${deploy.plugin.version}</version>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
@@ -261,8 +244,8 @@
             </activation>
             <repositories>
                 <repository>
-                    <id>sonatype-snapshot</id>
-                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+					<id>central-portal-snapshots</id>
+					<url>https://central.sonatype.com/repository/maven-snapshots/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -276,8 +259,8 @@
             <id>generate-version</id>
             <repositories>
                 <repository>
-                    <id>sonatype-snapshot</id>
-                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+					<id>central-portal-snapshots</id>
+					<url>https://central.sonatype.com/repository/maven-snapshots/</url>
                     <releases>
                         <enabled>false</enabled>
                     </releases>
@@ -299,14 +282,13 @@
                         <artifactId>maven-javadoc-plugin</artifactId>
                     </plugin>
                     <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>${nexus-staging-maven-plugin.version}</version>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
+                        <version>${central-publishing-maven-plugin.version}</version>
                         <extensions>true</extensions>
                         <configuration>
-                            <serverId>ossrh</serverId>
-                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                            <publishingServerId>central</publishingServerId>
+                            <autoPublish>true</autoPublish>
                         </configuration>
                     </plugin>
                     <plugin>