Skip to content

Commit 464f5c4

Browse files
committed
fix release workflow, update parent pom to 0.146.55
1 parent 356f49e commit 464f5c4

File tree

3 files changed

+11
-15
lines changed

3 files changed

+11
-15
lines changed

.github/workflows/release.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ jobs:
4646
uses: actions/setup-java@v1
4747
with:
4848
java-version: 11
49-
- name: Configure Sonatype mirror
50-
uses: s4u/maven-settings-action@v2.3.0
51-
# Go to Sonatype directly to avoid delay syncs (could get rid of this if actions/setup-java were to support mirrors).
52-
with:
53-
mirrors: '[{"id": "oss-releases", "name": "Sonatype releases", "mirrorOf": "*", "url": "https://oss.sonatype.org/content/repositories/releases/"}]'
5449
- name: Download Java dependencies
5550
# We do as much as we can, but it may not be enough (https://issues.apache.org/jira/browse/MDEP-82)
5651
run: |
@@ -69,28 +64,29 @@ jobs:
6964
# Will be pushed as part of the release process, only if the release is successful
7065
git commit -m "pom.xml: update killbill-oss-parent to ${{ github.event.inputs.parent_version }}"
7166
- name: Configure settings.xml for release
72-
uses: actions/setup-java@v1
67+
uses: actions/setup-java@v3
7368
with:
7469
java-version: 11
70+
distribution: temurin
7571
server-id: ossrh-releases
76-
server-username: OSSRH_USER
77-
server-password: OSSRH_PASS
72+
server-username: MAVEN_USERNAME
73+
server-password: MAVEN_PASSWORD
7874
gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }}
7975
gpg-passphrase: GPG_PASSPHRASE
8076
- name: Release artifacts
8177
if: github.event.inputs.perform_version == ''
8278
env:
83-
OSSRH_USER: ${{ secrets.OSSRH_USER }}
84-
OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
79+
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
80+
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
8581
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
8682
# 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).
8783
run: |
8884
mvn ${MAVEN_FLAGS} release:clean release:prepare release:perform
8985
- name: Perform release
9086
if: github.event.inputs.perform_version != ''
9187
env:
92-
OSSRH_USER: ${{ secrets.OSSRH_USER }}
93-
OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
88+
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
89+
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
9490
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
9591
# 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).
9692
# See https://issues.apache.org/jira/browse/SCM-729 for why the release.properties file is required.

.github/workflows/snapshot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ jobs:
88
snapshot:
99
uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@main
1010
secrets:
11-
OSSRH_USER: ${{ secrets.OSSRH_USER }}
12-
OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
11+
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
12+
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.kill-bill.billing</groupId>
2323
<artifactId>killbill-oss-parent</artifactId>
24-
<version>0.146.40</version>
24+
<version>0.146.55</version>
2525
</parent>
2626
<groupId>org.kill-bill.billing.plugin.java</groupId>
2727
<artifactId>killbill-base-plugin</artifactId>

0 commit comments

Comments
 (0)