From a03b27f177c9c296f2332d09a57ca8dd19fbbbd1 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Sat, 25 Apr 2026 13:57:46 +0700 Subject: [PATCH 1/6] update version to 1.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 27c03d2..fa0bede 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 0.146.66 killbill-client-java - 1.3.13-SNAPSHOT + 1.4.0-SNAPSHOT jar Kill Bill Client Java Kill Bill Java client library From 6542121510374e9d52a624ee8c4363f076a3028c Mon Sep 17 00:00:00 2001 From: xsalefter Date: Sat, 25 Apr 2026 13:58:27 +0700 Subject: [PATCH 2/6] snapshot : update version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa0bede..f8142c2 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.billing killbill-oss-parent - 0.146.66 + 0.147.0-4494b1e-SNAPSHOT killbill-client-java 1.4.0-SNAPSHOT From 069c4c6812a06775706d6960f869e4590a5cff53 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Sat, 25 Apr 2026 14:11:38 +0700 Subject: [PATCH 3/6] update CI files to use latest actions. remove old steps in sync.yml --- .github/workflows/ci.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/release.yml | 13 +++++++------ .github/workflows/snapshot.yml | 2 +- .github/workflows/sync.yml | 27 +++------------------------ 5 files changed, 13 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 660cce0..cebed07 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,4 +7,4 @@ on: jobs: ci: - uses: killbill/gh-actions-shared/.github/workflows/ci.yml@main + uses: killbill/gh-actions-shared/.github/workflows/ci.yml@java21 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c150684..b8add17 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -7,4 +7,4 @@ on: jobs: analyze: - uses: killbill/gh-actions-shared/.github/workflows/codeql-analysis.yml@main + uses: killbill/gh-actions-shared/.github/workflows/codeql-analysis.yml@java21 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd21ecf..3b61be9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,11 +27,11 @@ jobs: steps: - name: Checkout code if: github.event.inputs.perform_version == '' - uses: actions/checkout@v2 + uses: actions/checkout@v6 - name: Checkout full repository # Required when performing an existing release. if: github.event.inputs.perform_version != '' - uses: actions/checkout@v2 + uses: actions/checkout@v6 with: fetch-depth: '0' - name: Setup git user @@ -43,9 +43,10 @@ jobs: 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@v1 + uses: actions/setup-java@v5 with: - java-version: 11 + 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: | @@ -64,9 +65,9 @@ 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@v3 + uses: actions/setup-java@v5 with: - java-version: 11 + java-version: 21 distribution: temurin server-id: central server-username: MAVEN_USERNAME diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index ad45d25..cd51d66 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -6,7 +6,7 @@ on: jobs: snapshot: - uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@main + uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@java21 secrets: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 549a6d1..f044f85 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -7,27 +7,6 @@ on: jobs: sync: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - ref: work-for-release-0.23.x - ssh-key: ${{ secrets.CREATE_PULL_REQUEST_SSH_KEY }} - - 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: Merge master branch - run: | - git merge origin/master - - name: Create Pull Request - uses: peter-evans/create-pull-request@v3 - with: - branch: work-for-release-0.23.x-promotion - title: 'Sync master into work-for-release-0.23.x' - body: 'Merge latest master into work-for-release-0.23.x' + uses: killbill/gh-actions-shared/.github/workflows/sync.yml@java21 + secrets: + CREATE_PULL_REQUEST_SSH_KEY: ${{ secrets.CREATE_PULL_REQUEST_SSH_KEY }} From 7a6ad0722f2213b1eb902d2e10afeaac62738511 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Sat, 25 Apr 2026 14:17:35 +0700 Subject: [PATCH 4/6] ignore agent file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cd76f07..f3f5399 100644 --- a/.gitignore +++ b/.gitignore @@ -223,3 +223,4 @@ Temporary Items *.tmproj *.tmproject tmtags +/.codex From 6d7416f505348505459cd23fa32ba52bc7bf217b Mon Sep 17 00:00:00 2001 From: xsalefter Date: Sat, 25 Apr 2026 14:18:58 +0700 Subject: [PATCH 5/6] ignore CT_CONSTRUCTOR_THROW spotbugs error --- spotbugs-exclude.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml index b3dfa74..073a04c 100644 --- a/spotbugs-exclude.xml +++ b/spotbugs-exclude.xml @@ -16,6 +16,21 @@ --> + + + + + + + + + + + + + + + From ff09dcd911ba8d22b227ffe9490de05fba2f392b Mon Sep 17 00:00:00 2001 From: xsalefter Date: Wed, 10 Jun 2026 00:46:01 +0700 Subject: [PATCH 6/6] update killbill-oss-version to 0.147.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5fd543a..b37656f 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.billing killbill-oss-parent - 0.147.0-4494b1e-SNAPSHOT + 0.147.5 killbill-client-java 1.4.1-SNAPSHOT