From 464f5c48535604952dcdcea4ce6c8abf595edc75 Mon Sep 17 00:00:00 2001 From: reshmabidikar Date: Mon, 23 Jun 2025 09:37:36 +0530 Subject: [PATCH 1/6] fix release workflow, update parent pom to 0.146.55 --- .github/workflows/release.yml | 20 ++++++++------------ .github/workflows/snapshot.yml | 4 ++-- pom.xml | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f0aeb310..e92b5007 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,11 +46,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: | @@ -69,19 +64,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 + distribution: temurin server-id: ossrh-releases - server-username: OSSRH_USER - server-password: OSSRH_PASS + 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: | @@ -89,8 +85,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/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 93240c24..ad45d253 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -8,5 +8,5 @@ jobs: snapshot: uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@main secrets: - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_PASS: ${{ secrets.OSSRH_PASS }} + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} diff --git a/pom.xml b/pom.xml index 3495f801..b45fc872 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.kill-bill.billing killbill-oss-parent - 0.146.40 + 0.146.55 org.kill-bill.billing.plugin.java killbill-base-plugin From 5a820b0abe331e2ae3a18f1076e246c7678bb4a9 Mon Sep 17 00:00:00 2001 From: Kill Bill core team Date: Mon, 23 Jun 2025 04:15:10 +0000 Subject: [PATCH 2/6] [maven-release-plugin] prepare release killbill-base-plugin-5.1.7 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b45fc872..dad382ef 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.kill-bill.billing.plugin.java killbill-base-plugin - 5.1.7-SNAPSHOT + 5.1.7 jar Kill Bill base OSGI plugin Kill Bill base OSGI plugin @@ -33,7 +33,7 @@ scm:git:git://github.com/killbill/killbill-plugin-framework-java.git scm:git:git@github.com:killbill/killbill-plugin-framework-java.git - HEAD + killbill-base-plugin-5.1.7 http://github.com/killbill/killbill-plugin-framework-java/tree/master From c5a44aa6d9595f00992d21a066a8a40b7347d253 Mon Sep 17 00:00:00 2001 From: Kill Bill core team Date: Mon, 23 Jun 2025 04:15:11 +0000 Subject: [PATCH 3/6] [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 dad382ef..037d8f61 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.kill-bill.billing.plugin.java killbill-base-plugin - 5.1.7 + 5.1.8-SNAPSHOT jar Kill Bill base OSGI plugin Kill Bill base OSGI plugin @@ -33,7 +33,7 @@ scm:git:git://github.com/killbill/killbill-plugin-framework-java.git scm:git:git@github.com:killbill/killbill-plugin-framework-java.git - killbill-base-plugin-5.1.7 + HEAD http://github.com/killbill/killbill-plugin-framework-java/tree/master From a0ceaccfc8191730f9e35bdaac9a2e73e8381d1d Mon Sep 17 00:00:00 2001 From: reshmabidikar Date: Mon, 23 Jun 2025 09:52:31 +0530 Subject: [PATCH 4/6] fix server id --- .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 e92b5007..dea21ead 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,7 +68,7 @@ jobs: with: java-version: 11 distribution: temurin - server-id: ossrh-releases + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }} From dd3f7f8059b6832ec78e125201d6ee7dc2159576 Mon Sep 17 00:00:00 2001 From: Kill Bill core team Date: Mon, 23 Jun 2025 04:29:57 +0000 Subject: [PATCH 5/6] [maven-release-plugin] prepare release killbill-base-plugin-5.1.8 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 037d8f61..4dd73b49 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.kill-bill.billing.plugin.java killbill-base-plugin - 5.1.8-SNAPSHOT + 5.1.8 jar Kill Bill base OSGI plugin Kill Bill base OSGI plugin @@ -33,7 +33,7 @@ scm:git:git://github.com/killbill/killbill-plugin-framework-java.git scm:git:git@github.com:killbill/killbill-plugin-framework-java.git - HEAD + killbill-base-plugin-5.1.8 http://github.com/killbill/killbill-plugin-framework-java/tree/master From 4c967f94f647c0d8dbb36d2b117c19e46851717b Mon Sep 17 00:00:00 2001 From: Kill Bill core team Date: Mon, 23 Jun 2025 04:29:58 +0000 Subject: [PATCH 6/6] [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 4dd73b49..ef475d2a 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.kill-bill.billing.plugin.java killbill-base-plugin - 5.1.8 + 5.1.9-SNAPSHOT jar Kill Bill base OSGI plugin Kill Bill base OSGI plugin @@ -33,7 +33,7 @@ scm:git:git://github.com/killbill/killbill-plugin-framework-java.git scm:git:git@github.com:killbill/killbill-plugin-framework-java.git - killbill-base-plugin-5.1.8 + HEAD http://github.com/killbill/killbill-plugin-framework-java/tree/master