diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f0aeb31..dea21ea 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 3495f80..ef475d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,11 +21,11 @@
org.kill-bill.billing
killbill-oss-parent
- 0.146.40
+ 0.146.55
org.kill-bill.billing.plugin.java
killbill-base-plugin
- 5.1.7-SNAPSHOT
+ 5.1.9-SNAPSHOT
jar
Kill Bill base OSGI plugin
Kill Bill base OSGI plugin