From b3b9eb6524dd369a8df53a3de53fcf0a87d1ac5b Mon Sep 17 00:00:00 2001
From: Matej Novotny <manovotn@redhat.com>
Date: Thu, 15 May 2025 21:42:22 +0200
Subject: [PATCH 1/2] Update Parent, update BOM release setup

---
 .github/workflows/release.yml | 10 +++++-----
 bom/pom.xml                   | 34 ++++++++++++++--------------------
 pom.xml                       |  2 +-
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5d8b38cc..1b015721 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,16 +32,16 @@ jobs:
       with:
         distribution: temurin
         java-version: 17
-        server-id: 'sonatype-nexus-staging'
-        server-username: 'MAVEN_DEPLOY_USERNAME'
-        server-password: 'MAVEN_DEPLOY_TOKEN'
+        server-id: 'central'
+        server-username: 'CENTRAL_PORTAL_USERNAME'
+        server-password: 'CENTRAL_PORTAL_PWD'
         gpg-private-key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}}
         gpg-passphrase: 'MAVEN_GPG_PASSPHRASE'
 
     - name: Maven release ${{steps.metadata.outputs.current-version}}
       env:
-        MAVEN_DEPLOY_USERNAME: ${{secrets.MAVEN_DEPLOY_USERNAME}}
-        MAVEN_DEPLOY_TOKEN: ${{secrets.MAVEN_DEPLOY_TOKEN}}
+        CENTRAL_PORTAL_USERNAME: ${{secrets.CENTRAL_PORTAL_USERNAME}}
+        CENTRAL_PORTAL_PWD: ${{secrets.CENTRAL_PORTAL_PWD}}
         MAVEN_GPG_PASSPHRASE: ${{secrets.MAVEN_GPG_PASSPHRASE}}
       run: |
         export MAVEN_OPTS="--add-opens=java.base/java.util=ALL-UNNAMED"
diff --git a/bom/pom.xml b/bom/pom.xml
index bab92b97..9526cc60 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -35,8 +35,7 @@
         </jboss.releases.repo.url>
         <jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/
         </jboss.snapshots.repo.url>
-        <ossrh.releases.repo.url>https://oss.sonatype.org/service/local/staging/deploy/maven2</ossrh.releases.repo.url>
-        <ossrh.snapshots.repo.url>https://oss.sonatype.org/content/repositories/snapshots</ossrh.snapshots.repo.url>
+        <central.portal.releases.repo.url>https://central.sonatype.com/api/v1/publisher</central.portal.releases.repo.url>
     </properties>
 
     <dependencyManagement>
@@ -96,16 +95,16 @@
                         </executions>
                     </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>0.7.0</version>
                         <extensions>true</extensions>
                         <configuration>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                            <serverId>sonatype-nexus-staging</serverId>
-                            <stagingProgressTimeoutMinutes>15</stagingProgressTimeoutMinutes>
-                            <!-- Automatically releases staging repo, no manual action needed -->
-                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                            <publishingServerId>central</publishingServerId>
+                            <!-- Automatically publish staged repo -->
+                            <autoPublish>true</autoPublish>
+                            <!-- The plugin will block and wait until the artifact is published -->
+                            <waitUntil>published</waitUntil>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -134,9 +133,9 @@
                 </snapshotRepository>
             </distributionManagement>
         </profile>
-        <!-- OSSRH release repository - selected by default -->
+        <!-- Sonatype Central Portal - selected by default -->
         <profile>
-            <id>ossrh-release-repo</id>
+            <id>central-portal-release-repo</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
                 <property>
@@ -144,15 +143,10 @@
                 </property>
             </activation>
             <distributionManagement>
-                <snapshotRepository>
-                    <id>sonatype-nexus-snapshots</id>
-                    <name>Sonatype Nexus Snapshots</name>
-                    <url>${ossrh.snapshots.repo.url}</url>
-                </snapshotRepository>
                 <repository>
-                    <id>sonatype-nexus-staging</id>
-                    <name>Nexus Release Repository</name>
-                    <url>${ossrh.releases.repo.url}</url>
+                    <id>central-portal-staging</id>
+                    <name>Central Portal Repository</name>
+                    <url>${central.portal.releases.repo.url}</url>
                 </repository>
             </distributionManagement>
         </profile>
diff --git a/pom.xml b/pom.xml
index a3472cfd..8c8bbe0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jboss.weld</groupId>
         <artifactId>weld-parent</artifactId>
-        <version>53</version>
+        <version>54</version>
     </parent>
 
     <name>Weld APIs Parent</name>

From 4b3c88c76f5f34b0f7ebb06d5f22288ae70b1b3a Mon Sep 17 00:00:00 2001
From: Matej Novotny <manovotn@redhat.com>
Date: Thu, 15 May 2025 22:21:05 +0200
Subject: [PATCH 2/2] Fix GH actions branch reference in release script

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1b015721..529bbc3a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - name: Retrieve project metadata
       id: metadata
-      uses: radcortez/project-metadata-action@master
+      uses: radcortez/project-metadata-action@main
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         metadata-file-path: '.github/project.yml'