From 422c93f27184b6466ec85beeb19bba7725992f2c Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <zanini@redhat.com>
Date: Fri, 10 Nov 2023 14:48:48 -0300
Subject: [PATCH 1/3] Fix release pipeline to checkout before performing
 release

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 .github/workflows/release.yml | 9 +++++----
 pom.xml                       | 5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f14236a8..accd5196 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -46,13 +46,14 @@ jobs:
 
       - name: Maven release ${{steps.metadata.outputs.current-version}}
         run: |
+          git checkout -b release
           mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
+          git checkout ${{github.base_ref}}
+          git rebase release
           mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
 
-      - name: Push changes to ${{github.base_ref}} branch
-        run: |
-          git push
-          git push origin ${{steps.metadata.outputs.current-version}}
+      - name: Push tags
+        run: git push && git push --tags
diff --git a/pom.xml b/pom.xml
index 0bb4b2b6..40208f3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
     <version.jdk>${java.version}</version.jdk>
     <version.jsonschema2pojo-maven-plugin>1.0.1</version.jsonschema2pojo-maven-plugin>
     <version.javadoc.plugin>3.6.0</version.javadoc.plugin>
-    <version.release.plugin>2.3.2</version.release.plugin>
+    <version.release.plugin>2.5.3</version.release.plugin>
     <version.source.plugin>3.3.0</version.source.plugin>
     <version.surefire.plugin>2.22.0</version.surefire.plugin>
 
@@ -277,6 +277,9 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-gpg-plugin</artifactId>
           <version>${version.gpg.plugin}</version>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>

From 3c7bf1765ec6b3fc6ed4426004abc4369c9ed0f5 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <zanini@redhat.com>
Date: Fri, 10 Nov 2023 15:00:02 -0300
Subject: [PATCH 2/3] Debug release properties and remove skip gpg sign

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 .github/workflows/release.yml | 1 +
 pom.xml                       | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index accd5196..3a188b77 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,6 +48,7 @@ jobs:
         run: |
           git checkout -b release
           mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
+          cat release.properties
           git checkout ${{github.base_ref}}
           git rebase release
           mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease
diff --git a/pom.xml b/pom.xml
index 40208f3e..eb1afa9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,9 +277,6 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-gpg-plugin</artifactId>
           <version>${version.gpg.plugin}</version>
-          <configuration>
-            <skip>true</skip>
-          </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>

From 566f1577758796eecc6ecac097db59083605340f Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <zanini@redhat.com>
Date: Fri, 10 Nov 2023 15:26:10 -0300
Subject: [PATCH 3/3] Upgrade maven release and update distribution server id

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index eb1afa9f..65ecc39e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
     <version.jdk>${java.version}</version.jdk>
     <version.jsonschema2pojo-maven-plugin>1.0.1</version.jsonschema2pojo-maven-plugin>
     <version.javadoc.plugin>3.6.0</version.javadoc.plugin>
-    <version.release.plugin>2.5.3</version.release.plugin>
+    <version.release.plugin>3.0.1</version.release.plugin>
     <version.source.plugin>3.3.0</version.source.plugin>
     <version.surefire.plugin>2.22.0</version.surefire.plugin>
 
@@ -433,7 +433,7 @@
 
   <distributionManagement>
     <snapshotRepository>
-      <id>ossrh</id>
+      <id>ossrh-snapshots</id>
       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </snapshotRepository>
     <repository>