diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0e2a9a3b..725672a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,6 +7,9 @@ on:
jobs:
ci:
- uses: killbill/gh-actions-shared/.github/workflows/ci.yml@java21
+ uses: killbill/gh-actions-shared/.github/workflows/ci.yml@main
with:
- test-profile-matrix: '[ "travis", "mysql", "postgresql", "jdbi", "config-magic" ]'
+ failure-upload-path: 'target/*'
+ secrets:
+ CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }}
+ CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }}
diff --git a/.github/workflows/cloudsmith_release.yml b/.github/workflows/cloudsmith_release.yml
deleted file mode 100644
index da426bba..00000000
--- a/.github/workflows/cloudsmith_release.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: cloudsmith_release
-
-on:
- workflow_dispatch:
-
-jobs:
- cloudsmith_release:
- uses: killbill/gh-actions-shared/.github/workflows/cloudsmith_release.yml@java21
- with:
- group_id: org.kill-bill.commons
- secrets:
- CLOUDSMITH_REPO: ${{ secrets.CLOUDSMITH_REPO }}
- CLOUDSMITH_USER: ${{ secrets.CLOUDSMITH_USER }}
- CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index b8add174..7d120c83 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -7,4 +7,7 @@ on:
jobs:
analyze:
- uses: killbill/gh-actions-shared/.github/workflows/codeql-analysis.yml@java21
+ uses: killbill/gh-actions-shared/.github/workflows/codeql-analysis.yml@main
+ secrets:
+ CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }}
+ CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 805b9a37..518ce8f4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,88 +17,18 @@ on:
default: true
type: boolean
-env:
- MAVEN_FLAGS: "-B --no-transfer-progress"
- MAVEN_OPTS: "-Xmx2G -XX:+ExitOnOutOfMemoryError -Dmaven.wagon.rto=60000 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3"
-
jobs:
release:
- runs-on: ubuntu-latest
- steps:
- - name: Checkout code
- if: github.event.inputs.perform_version == ''
- uses: actions/checkout@v6
- - name: Checkout full repository
- # Required when performing an existing release.
- if: github.event.inputs.perform_version != ''
- uses: actions/checkout@v6
- with:
- fetch-depth: '0'
- - name: Setup git user
- env:
- BUILD_USER: ${{ secrets.BUILD_USER }}
- BUILD_TOKEN: ${{ secrets.BUILD_TOKEN }}
- run: |
- git config --global user.email "contact@killbill.io"
- git config --global user.name "Kill Bill core team"
- git config --global url."https://${BUILD_USER}:${BUILD_TOKEN}@github.com/".insteadOf "git@github.com:"
- - name: Configure Java
- uses: actions/setup-java@v5
- with:
- java-version: 21
- distribution: temurin
- - 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: |
- mvn ${MAVEN_FLAGS} clean install dependency:resolve dependency:resolve-plugins -DskipTests=true -Dgpg.skip=true -Psonatype-oss-release
- - name: Update killbill-oss-parent
- if: github.event.inputs.parent_version != ''
- run: |
- echo "Updating killbill-oss-parent pom.xml to ${{ github.event.inputs.parent_version }}:"
- mvn ${MAVEN_FLAGS} versions:update-parent -DgenerateBackupPoms=false -DparentVersion="[${{ github.event.inputs.parent_version }}]"
- echo "killbill-oss-parent pom.xml changes:"
- git --no-pager diff
- echo "Downloading new dependencies:"
- mvn ${MAVEN_FLAGS} -U clean install -DskipTests=true
-
- git add pom.xml
- # 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@v5
- with:
- java-version: 21
- 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:
- 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: |
- mvn ${MAVEN_FLAGS} release:clean release:prepare release:perform
- - name: Perform release
- if: github.event.inputs.perform_version != ''
- env:
- 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.
- run: |
- echo "scm.url=scm\:git\:git@github.com\:${GITHUB_REPOSITORY}.git" > release.properties
- echo "scm.tag=${{ github.event.inputs.perform_version }}" >> release.properties
- mvn ${MAVEN_FLAGS} release:perform
- - name: Send Repository Dispatch Event
- if: github.event.inputs.release_oss_parent == 'true'
- env:
- GH_TOKEN: ${{ secrets.GH_WORKFLOW_PAT }}
- run: |
- PROJECT_VERSION=$(git describe --abbrev=0 | cut -d '-' -f 3)
- gh workflow -R killbill/killbill-oss-parent run release.yml -f commons_version=${PROJECT_VERSION}
+ uses: killbill/gh-actions-shared/.github/workflows/release.yml@main
+ with:
+ parent_version: ${{ github.event.inputs.parent_version }}
+ perform_version: ${{ github.event.inputs.perform_version }}
+ secrets:
+ BUILD_USER: ${{ secrets.BUILD_USER }}
+ BUILD_TOKEN: ${{ secrets.BUILD_TOKEN }}
+ CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }}
+ CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }}
+ CLOUDSMITH_DISTRIBUTION_MAN_USERNAME: ${{ secrets.CLOUDSMITH_DISTRIBUTION_MAN_USERNAME }}
+ CLOUDSMITH_DISTRIBUTION_MAN_PASSWORD: ${{ secrets.CLOUDSMITH_DISTRIBUTION_MAN_PASSWORD }}
+ GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
+ GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index cd51d668..d4ea57aa 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -6,7 +6,9 @@ on:
jobs:
snapshot:
- uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@java21
+ uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@main
secrets:
- MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
- MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+ CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }}
+ CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }}
+ CLOUDSMITH_DISTRIBUTION_MAN_USERNAME: ${{ secrets.CLOUDSMITH_DISTRIBUTION_MAN_USERNAME }}
+ CLOUDSMITH_DISTRIBUTION_MAN_PASSWORD: ${{ secrets.CLOUDSMITH_DISTRIBUTION_MAN_PASSWORD }}
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
index f044f851..724801ae 100644
--- a/.github/workflows/sync.yml
+++ b/.github/workflows/sync.yml
@@ -7,6 +7,6 @@ on:
jobs:
sync:
- uses: killbill/gh-actions-shared/.github/workflows/sync.yml@java21
+ uses: killbill/gh-actions-shared/.github/workflows/sync.yml@main
secrets:
CREATE_PULL_REQUEST_SSH_KEY: ${{ secrets.CREATE_PULL_REQUEST_SSH_KEY }}
diff --git a/automaton/pom.xml b/automaton/pom.xml
index 3023e69a..261e3c3d 100644
--- a/automaton/pom.xml
+++ b/automaton/pom.xml
@@ -22,7 +22,7 @@
org.kill-bill.commons
killbill-commons
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
killbill-automaton
diff --git a/clock/pom.xml b/clock/pom.xml
index 4acd3d11..03dab83a 100644
--- a/clock/pom.xml
+++ b/clock/pom.xml
@@ -22,7 +22,7 @@
org.kill-bill.commons
killbill-commons
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
killbill-clock
diff --git a/concurrent/pom.xml b/concurrent/pom.xml
index 36f77d9f..dc630207 100644
--- a/concurrent/pom.xml
+++ b/concurrent/pom.xml
@@ -22,7 +22,7 @@
org.kill-bill.commons
killbill-commons
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
killbill-concurrent
diff --git a/config-magic/pom.xml b/config-magic/pom.xml
index 8627e16d..f32ed56b 100644
--- a/config-magic/pom.xml
+++ b/config-magic/pom.xml
@@ -20,7 +20,7 @@
org.kill-bill.commons
killbill-commons
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
killbill-config-magic
diff --git a/embeddeddb/common/pom.xml b/embeddeddb/common/pom.xml
index 8fd11f15..16ffe45f 100644
--- a/embeddeddb/common/pom.xml
+++ b/embeddeddb/common/pom.xml
@@ -22,7 +22,7 @@
org.kill-bill.commons
killbill-embeddeddb
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
killbill-embeddeddb-common
diff --git a/embeddeddb/h2/pom.xml b/embeddeddb/h2/pom.xml
index 0376f146..f8483914 100644
--- a/embeddeddb/h2/pom.xml
+++ b/embeddeddb/h2/pom.xml
@@ -22,7 +22,7 @@
org.kill-bill.commons
killbill-embeddeddb
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
killbill-embeddeddb-h2
diff --git a/embeddeddb/mysql/pom.xml b/embeddeddb/mysql/pom.xml
index d07f82ef..9ea1ad0f 100644
--- a/embeddeddb/mysql/pom.xml
+++ b/embeddeddb/mysql/pom.xml
@@ -22,7 +22,7 @@
org.kill-bill.commons
killbill-embeddeddb
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
killbill-embeddeddb-mysql
diff --git a/embeddeddb/pom.xml b/embeddeddb/pom.xml
index d7296b3c..084ae601 100644
--- a/embeddeddb/pom.xml
+++ b/embeddeddb/pom.xml
@@ -22,7 +22,7 @@
org.kill-bill.commons
killbill-commons
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
killbill-embeddeddb
diff --git a/embeddeddb/postgresql/pom.xml b/embeddeddb/postgresql/pom.xml
index c4a9f989..0ead10c3 100644
--- a/embeddeddb/postgresql/pom.xml
+++ b/embeddeddb/postgresql/pom.xml
@@ -22,7 +22,7 @@
org.kill-bill.commons
killbill-embeddeddb
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
killbill-embeddeddb-postgresql
diff --git a/jdbi/pom.xml b/jdbi/pom.xml
index 61d243f3..e9029bfe 100644
--- a/jdbi/pom.xml
+++ b/jdbi/pom.xml
@@ -22,7 +22,7 @@
org.kill-bill.commons
killbill-commons
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
killbill-jdbi
diff --git a/jooby/pom.xml b/jooby/pom.xml
index 59ccdd0a..41d4fc5b 100644
--- a/jooby/pom.xml
+++ b/jooby/pom.xml
@@ -20,7 +20,7 @@
org.kill-bill.commons
killbill-commons
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
killbill-jooby
diff --git a/locker/pom.xml b/locker/pom.xml
index 9dce9b1e..06f72308 100644
--- a/locker/pom.xml
+++ b/locker/pom.xml
@@ -22,7 +22,7 @@
org.kill-bill.commons
killbill-commons
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
killbill-locker
diff --git a/metrics-api/pom.xml b/metrics-api/pom.xml
index f1cc0801..6cef65be 100644
--- a/metrics-api/pom.xml
+++ b/metrics-api/pom.xml
@@ -20,7 +20,7 @@
org.kill-bill.commons
killbill-commons
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
killbill-metrics-api
KillBill Metrics API
diff --git a/metrics/pom.xml b/metrics/pom.xml
index a66cee49..93efd0ff 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -20,7 +20,7 @@
org.kill-bill.commons
killbill-commons
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
killbill-metrics
KillBill Metrics
diff --git a/pom.xml b/pom.xml
index 14b2dc38..5120c7f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,11 +22,11 @@
org.kill-bill.billing
killbill-oss-parent
- 0.147.14
+ 0.147.23
org.kill-bill.commons
killbill-commons
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
pom
killbill-commons
Kill Bill reusable Java components
@@ -66,6 +66,7 @@
true
+ killbill-commons
-Xmx${build.jvmsize} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED
diff --git a/queue/pom.xml b/queue/pom.xml
index 9a2feb38..4dd970a1 100644
--- a/queue/pom.xml
+++ b/queue/pom.xml
@@ -22,7 +22,7 @@
org.kill-bill.commons
killbill-commons
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
killbill-queue
diff --git a/skeleton/pom.xml b/skeleton/pom.xml
index 5d6b7b29..55f32b7e 100644
--- a/skeleton/pom.xml
+++ b/skeleton/pom.xml
@@ -22,7 +22,7 @@
org.kill-bill.commons
killbill-commons
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
killbill-skeleton
diff --git a/utils/pom.xml b/utils/pom.xml
index fc2811b9..b9423ce1 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -20,7 +20,7 @@
org.kill-bill.commons
killbill-commons
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
diff --git a/xmlloader/pom.xml b/xmlloader/pom.xml
index 3d7ad1b9..0b432f87 100644
--- a/xmlloader/pom.xml
+++ b/xmlloader/pom.xml
@@ -22,7 +22,7 @@
org.kill-bill.commons
killbill-commons
- 0.27.3-SNAPSHOT
+ 0.27.4-SNAPSHOT
../pom.xml
killbill-xmlloader