From 316679ca191604ac9d13b722a6cbec329f8d6720 Mon Sep 17 00:00:00 2001 From: reshmabidikar Date: Tue, 24 Jun 2025 10:08:50 +0530 Subject: [PATCH 1/3] Fix release/snapshot workflow, update parent pom version --- .github/workflows/release.yml | 22 +++++++++------------- .github/workflows/snapshot.yml | 4 ++-- pom.xml | 6 +++--- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ec19c14..dd21ecf 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 - 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: | @@ -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 93240c2..ad45d25 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 641e7ca..5a4233a 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.billing killbill-oss-parent - 0.146.49 + 0.146.57 killbill-client-java 1.3.9-SNAPSHOT @@ -125,8 +125,8 @@ - - + + MANIFEST.MF From a0a809010cc5bc76c9b9c613cdba4bfe26e6093a Mon Sep 17 00:00:00 2001 From: Kill Bill core team Date: Tue, 24 Jun 2025 04:46:18 +0000 Subject: [PATCH 2/3] [maven-release-plugin] prepare release killbill-client-java-1.3.9 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5a4233a..7b28635 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 0.146.57 killbill-client-java - 1.3.9-SNAPSHOT + 1.3.9 jar Kill Bill Client Java Kill Bill Java client library @@ -33,7 +33,7 @@ scm:git:git://github.com/killbill/killbill-client-java.git scm:git:git@github.com:killbill/killbill-client-java.git - HEAD + killbill-client-java-1.3.9 http://github.com/killbill/killbill-client-java/tree/master From 510a0552ca7942853c57373f68ede809c1878d7c Mon Sep 17 00:00:00 2001 From: Kill Bill core team Date: Tue, 24 Jun 2025 04:46:20 +0000 Subject: [PATCH 3/3] [maven-release-plugin] prepare for next development iteration --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 7b28635..1dcc78a 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 0.146.57 killbill-client-java - 1.3.9 + 1.3.10-SNAPSHOT jar Kill Bill Client Java Kill Bill Java client library @@ -33,7 +33,7 @@ scm:git:git://github.com/killbill/killbill-client-java.git scm:git:git@github.com:killbill/killbill-client-java.git - killbill-client-java-1.3.9 + HEAD http://github.com/killbill/killbill-client-java/tree/master @@ -125,8 +125,8 @@ - - + + MANIFEST.MF