diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c929f5a0..72608c51 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 93240c24..ad45d253 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/.idea/misc.xml b/.idea/misc.xml index cc1e11c6..e32f2d98 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,6 @@ + diff --git a/automaton/pom.xml b/automaton/pom.xml index 47380043..4f3b52da 100644 --- a/automaton/pom.xml +++ b/automaton/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT ../pom.xml killbill-automaton diff --git a/clock/pom.xml b/clock/pom.xml index 12a03d92..1a77b3fe 100644 --- a/clock/pom.xml +++ b/clock/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT ../pom.xml killbill-clock diff --git a/concurrent/pom.xml b/concurrent/pom.xml index bf8dd3d1..1a1e554a 100644 --- a/concurrent/pom.xml +++ b/concurrent/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT ../pom.xml killbill-concurrent diff --git a/config-magic/pom.xml b/config-magic/pom.xml index 206cf9c2..93bd8022 100644 --- a/config-magic/pom.xml +++ b/config-magic/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT ../pom.xml killbill-config-magic diff --git a/embeddeddb/common/pom.xml b/embeddeddb/common/pom.xml index 5e12f739..1364e66c 100644 --- a/embeddeddb/common/pom.xml +++ b/embeddeddb/common/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT ../pom.xml killbill-embeddeddb-common diff --git a/embeddeddb/h2/pom.xml b/embeddeddb/h2/pom.xml index c193d995..ff006ddf 100644 --- a/embeddeddb/h2/pom.xml +++ b/embeddeddb/h2/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT ../pom.xml killbill-embeddeddb-h2 diff --git a/embeddeddb/mysql/pom.xml b/embeddeddb/mysql/pom.xml index 3a85ab00..df89533f 100644 --- a/embeddeddb/mysql/pom.xml +++ b/embeddeddb/mysql/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT ../pom.xml killbill-embeddeddb-mysql diff --git a/embeddeddb/pom.xml b/embeddeddb/pom.xml index 4195b8d3..1ea4befc 100644 --- a/embeddeddb/pom.xml +++ b/embeddeddb/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT ../pom.xml killbill-embeddeddb diff --git a/embeddeddb/postgresql/pom.xml b/embeddeddb/postgresql/pom.xml index 71357b37..c706b32b 100644 --- a/embeddeddb/postgresql/pom.xml +++ b/embeddeddb/postgresql/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT ../pom.xml killbill-embeddeddb-postgresql diff --git a/jdbi/pom.xml b/jdbi/pom.xml index 2519b626..6b39a508 100644 --- a/jdbi/pom.xml +++ b/jdbi/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT ../pom.xml killbill-jdbi diff --git a/locker/pom.xml b/locker/pom.xml index 2fbc7790..2d2fa9f5 100644 --- a/locker/pom.xml +++ b/locker/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT ../pom.xml killbill-locker diff --git a/metrics-api/pom.xml b/metrics-api/pom.xml index 618bcbc6..b8327328 100644 --- a/metrics-api/pom.xml +++ b/metrics-api/pom.xml @@ -20,9 +20,10 @@ org.kill-bill.commons killbill-commons - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT killbill-metrics-api + KillBill Metrics API spotbugs-exclude.xml diff --git a/metrics/pom.xml b/metrics/pom.xml index 48fe264a..cd020ba5 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -20,9 +20,10 @@ org.kill-bill.commons killbill-commons - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT killbill-metrics + KillBill Metrics spotbugs-exclude.xml diff --git a/pom.xml b/pom.xml index 55aa246e..6de288a1 100644 --- a/pom.xml +++ b/pom.xml @@ -22,11 +22,11 @@ org.kill-bill.billing killbill-oss-parent - 0.146.39 + 0.146.54 org.kill-bill.commons killbill-commons - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT pom killbill-commons Kill Bill reusable Java components diff --git a/queue/pom.xml b/queue/pom.xml index 2fcbcd9d..066f44c1 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT ../pom.xml killbill-queue diff --git a/skeleton/pom.xml b/skeleton/pom.xml index 69417ef7..98cf9b58 100644 --- a/skeleton/pom.xml +++ b/skeleton/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT ../pom.xml killbill-skeleton diff --git a/utils/pom.xml b/utils/pom.xml index fa10f142..470ffc0c 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT ../pom.xml diff --git a/xmlloader/pom.xml b/xmlloader/pom.xml index 58664642..d9053c46 100644 --- a/xmlloader/pom.xml +++ b/xmlloader/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.8-SNAPSHOT + 0.26.11-SNAPSHOT ../pom.xml killbill-xmlloader