From 2473fb60145ec966911654465e015c0ee516bdae Mon Sep 17 00:00:00 2001 From: reshmabidikar Date: Thu, 24 Jul 2025 13:37:57 +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 618a45b..978f964 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 }} BRAINTREE_ENVIRONMENT: sandbox BRAINTREE_MERCHANT_ID: ${{ secrets.BT_MERCHANT_ID }} @@ -88,8 +84,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 bb70e61..70c4cd5 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.billing killbill-oss-parent - 0.146.6 + 0.146.63 org.kill-bill.billing.plugin.java braintree-plugin From 55d0430b5057c701dd313da43e0ac6c164498357 Mon Sep 17 00:00:00 2001 From: Kill Bill core team Date: Thu, 24 Jul 2025 08:14:14 +0000 Subject: [PATCH 2/3] [maven-release-plugin] prepare release braintree-plugin-1.0.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 70c4cd5..b49b460 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.kill-bill.billing.plugin.java braintree-plugin - 1.0.1-SNAPSHOT + 1.0.1 bundle Kill Bill Braintree plugin Kill Bill braintree plugin @@ -32,7 +32,7 @@ scm:git:git://github.com/killbill/killbill-braintree.git scm:git:git@github.com:killbill/killbill-braintree.git - HEAD + braintree-plugin-1.0.1 http://github.com/killbill/killbill-braintree/tree/master From 07fb860533e4eb5a5caf32733ae793ace12a78d1 Mon Sep 17 00:00:00 2001 From: Kill Bill core team Date: Thu, 24 Jul 2025 08:14:16 +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 b49b460..788b987 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.kill-bill.billing.plugin.java braintree-plugin - 1.0.1 + 1.0.2-SNAPSHOT bundle Kill Bill Braintree plugin Kill Bill braintree plugin @@ -32,7 +32,7 @@ scm:git:git://github.com/killbill/killbill-braintree.git scm:git:git@github.com:killbill/killbill-braintree.git - braintree-plugin-1.0.1 + HEAD http://github.com/killbill/killbill-braintree/tree/master