Skip to content

Commit 13f1a6b

Browse files
Merge pull request #33 from killbill/ossrh-migration
ossrh migration
2 parents de0f856 + 07fb860 commit 13f1a6b

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

.github/workflows/release.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ jobs:
4141
uses: actions/setup-java@v1
4242
with:
4343
java-version: 11
44-
- name: Configure Sonatype mirror
45-
uses: s4u/maven-settings-action@v2.3.0
46-
# Go to Sonatype directly to avoid delay syncs (could get rid of this if actions/setup-java were to support mirrors).
47-
with:
48-
mirrors: '[{"id": "oss-releases", "name": "Sonatype releases", "mirrorOf": "*", "url": "https://oss.sonatype.org/content/repositories/releases/"}]'
4944
- name: Download Java dependencies
5045
# We do as much as we can, but it may not be enough (https://issues.apache.org/jira/browse/MDEP-82)
5146
run: |
@@ -64,19 +59,20 @@ jobs:
6459
# Will be pushed as part of the release process, only if the release is successful
6560
git commit -m "pom.xml: update killbill-oss-parent to ${{ github.event.inputs.parent_version }}"
6661
- name: Configure settings.xml for release
67-
uses: actions/setup-java@v1
62+
uses: actions/setup-java@v3
6863
with:
6964
java-version: 11
70-
server-id: ossrh-releases
71-
server-username: OSSRH_USER
72-
server-password: OSSRH_PASS
65+
distribution: temurin
66+
server-id: central
67+
server-username: MAVEN_USERNAME
68+
server-password: MAVEN_PASSWORD
7369
gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }}
7470
gpg-passphrase: GPG_PASSPHRASE
7571
- name: Release artifacts
7672
if: github.event.inputs.perform_version == ''
7773
env:
78-
OSSRH_USER: ${{ secrets.OSSRH_USER }}
79-
OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
74+
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
75+
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
8076
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
8177
BRAINTREE_ENVIRONMENT: sandbox
8278
BRAINTREE_MERCHANT_ID: ${{ secrets.BT_MERCHANT_ID }}
@@ -88,8 +84,8 @@ jobs:
8884
- name: Perform release
8985
if: github.event.inputs.perform_version != ''
9086
env:
91-
OSSRH_USER: ${{ secrets.OSSRH_USER }}
92-
OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
87+
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
88+
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
9389
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
9490
# 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).
9591
# See https://issues.apache.org/jira/browse/SCM-729 for why the release.properties file is required.

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
<parent>
2121
<groupId>org.kill-bill.billing</groupId>
2222
<artifactId>killbill-oss-parent</artifactId>
23-
<version>0.146.6</version>
23+
<version>0.146.63</version>
2424
</parent>
2525
<groupId>org.kill-bill.billing.plugin.java</groupId>
2626
<artifactId>braintree-plugin</artifactId>
27-
<version>1.0.1-SNAPSHOT</version>
27+
<version>1.0.2-SNAPSHOT</version>
2828
<packaging>bundle</packaging>
2929
<name>Kill Bill Braintree plugin</name>
3030
<description>Kill Bill braintree plugin</description>

0 commit comments

Comments
 (0)