From aa3d5785a471e694372a37b8cd16c35d0ecee98a Mon Sep 17 00:00:00 2001
From: reshmabidikar <reshmabidikar@outlook.com>
Date: Fri, 25 Jul 2025 09:48:04 +0530
Subject: [PATCH 1/3] OSSRH migration

---
 .github/workflows/release.yml | 22 +++++++++-------------
 pom.xml                       |  2 +-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3e0791a..c8bfeeb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -41,11 +41,6 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 11
-      - name: Configure Sonatype mirror
-        uses: s4u/maven-settings-action@v2.3.0
-        # Go to Sonatype directly to avoid delay syncs (could get rid of this if actions/setup-java were to support mirrors).
-        with:
-          mirrors: '[{"id": "oss-releases", "name": "Sonatype releases", "mirrorOf": "*", "url": "https://oss.sonatype.org/content/repositories/releases/"}]'
       - name: Download Java dependencies
         # We do as much as we can, but it may not be enough (https://issues.apache.org/jira/browse/MDEP-82)
         run: |
@@ -64,19 +59,20 @@ jobs:
           # Will be pushed as part of the release process, only if the release is successful
           git commit -m "pom.xml: update killbill-oss-parent to ${{ github.event.inputs.parent_version }}"
       - name: Configure settings.xml for release
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 11
-          server-id: ossrh-releases
-          server-username: OSSRH_USER
-          server-password: OSSRH_PASS
+          distribution: temurin
+          server-id: central
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
           gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }}
           gpg-passphrase: GPG_PASSPHRASE
       - name: Release artifacts
         if: github.event.inputs.perform_version == ''
         env:
-          OSSRH_USER: ${{ secrets.OSSRH_USER }}
-          OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         # It will still check the remote but hopefully not download much (0 B at 0 B/s). -o isn't safe because of MDEP-82 (see above).
         run: |
@@ -84,8 +80,8 @@ jobs:
       - name: Perform release
         if: github.event.inputs.perform_version != ''
         env:
-          OSSRH_USER: ${{ secrets.OSSRH_USER }}
-          OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         # It will still check the remote but hopefully not download much (0 B at 0 B/s). -o isn't safe because of MDEP-82 (see above).
         # See https://issues.apache.org/jira/browse/SCM-729 for why the release.properties file is required.
diff --git a/pom.xml b/pom.xml
index 2065dd7..e64d9a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-oss-parent</artifactId>
-        <version>0.146.6</version>
+        <version>0.146.63</version>
     </parent>
     <groupId>org.kill-bill.billing.plugin.java</groupId>
     <artifactId>catalog-test-plugin</artifactId>

From bf97a5835f628e717a3baa9eca1a227399021262 Mon Sep 17 00:00:00 2001
From: Kill Bill core team <contact@killbill.io>
Date: Fri, 25 Jul 2025 04:23:33 +0000
Subject: [PATCH 2/3] [maven-release-plugin] prepare release
 catalog-test-plugin-0.5.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e64d9a5..ac4b13e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     </parent>
     <groupId>org.kill-bill.billing.plugin.java</groupId>
     <artifactId>catalog-test-plugin</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.5.2</version>
     <packaging>bundle</packaging>
     <name>Test Plugin for CatalogPluginApi</name>
     <description>Test Plugin for CatalogPluginApi</description>
@@ -34,7 +34,7 @@
     <scm>
         <connection>scm:git:git://github.com/killbill/killbill-catalog-plugin-test.git</connection>
         <developerConnection>scm:git:git@github.com:killbill/killbill-catalog-plugin-test.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>catalog-test-plugin-0.5.2</tag>
         <url>http://github.com/killbill/killbill-catalog-plugin-test/tree/master</url>
     </scm>
     <issueManagement>

From e866578a99c272034b84d513b3a4686e2dbe34f9 Mon Sep 17 00:00:00 2001
From: Kill Bill core team <contact@killbill.io>
Date: Fri, 25 Jul 2025 04:23:35 +0000
Subject: [PATCH 3/3] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ac4b13e..1273035 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     </parent>
     <groupId>org.kill-bill.billing.plugin.java</groupId>
     <artifactId>catalog-test-plugin</artifactId>
-    <version>0.5.2</version>
+    <version>0.5.3-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Test Plugin for CatalogPluginApi</name>
     <description>Test Plugin for CatalogPluginApi</description>
@@ -34,7 +34,7 @@
     <scm>
         <connection>scm:git:git://github.com/killbill/killbill-catalog-plugin-test.git</connection>
         <developerConnection>scm:git:git@github.com:killbill/killbill-catalog-plugin-test.git</developerConnection>
-        <tag>catalog-test-plugin-0.5.2</tag>
+        <tag>HEAD</tag>
         <url>http://github.com/killbill/killbill-catalog-plugin-test/tree/master</url>
     </scm>
     <issueManagement>