From 2fe74aff992d98b965c26ac4383977721c036a29 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Tue, 14 Apr 2026 04:12:09 +0700 Subject: [PATCH 1/7] update CIs to use java21 branch --- .github/workflows/ci.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/snapshot.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8728078..1ac6acc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,6 +7,6 @@ on: jobs: ci: - uses: killbill/gh-actions-shared/.github/workflows/ci.yml@main + uses: killbill/gh-actions-shared/.github/workflows/ci.yml@java21 with: - failure-upload-path: 'target/*' \ No newline at end of file + failure-upload-path: 'target/*' 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/snapshot.yml b/.github/workflows/snapshot.yml index 93240c2..76c2a88 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: OSSRH_USER: ${{ secrets.OSSRH_USER }} OSSRH_PASS: ${{ secrets.OSSRH_PASS }} From 76b7b744729010b038f7afd43f461be52a0c9501 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Tue, 14 Apr 2026 04:23:07 +0700 Subject: [PATCH 2/7] bump version to 0.55.0, remove spotbugs-maven-plugins because it is redundant --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 12d17b7..4e51168 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,10 @@ org.kill-bill.billing killbill-oss-parent - 0.146.0 + 0.147.2 killbill-api - 0.54.1-SNAPSHOT + 0.55.0-SNAPSHOT Kill Bill apis Kill Bill apis http://github.com/killbill/killbill-api From bbb04e89a279cef742bc52435f9479d12dd63b22 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 14 Apr 2026 03:34:58 +0000 Subject: [PATCH 3/7] migrate JAXB XmlEnum imports to jakarta namespace Agent-Logs-Url: https://github.com/killbill/killbill-api/sessions/959f715f-d8a3-40d5-9981-fc410c178309 Co-authored-by: xsalefter <510438+xsalefter@users.noreply.github.com> --- pom.xml | 8 ++++++++ .../java/org/killbill/billing/catalog/api/Currency.java | 2 +- .../java/org/killbill/billing/catalog/api/TimeUnit.java | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4e51168..7e2a291 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,14 @@ true spotbugs-exclude.xml + + + + jakarta.activation + jakarta.activation-api + + + com.fasterxml.jackson.core diff --git a/src/main/java/org/killbill/billing/catalog/api/Currency.java b/src/main/java/org/killbill/billing/catalog/api/Currency.java index eb073c5..b3640ba 100644 --- a/src/main/java/org/killbill/billing/catalog/api/Currency.java +++ b/src/main/java/org/killbill/billing/catalog/api/Currency.java @@ -16,7 +16,7 @@ package org.killbill.billing.catalog.api; -import javax.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnum; @XmlEnum public enum Currency { diff --git a/src/main/java/org/killbill/billing/catalog/api/TimeUnit.java b/src/main/java/org/killbill/billing/catalog/api/TimeUnit.java index 097bf4c..3faf5d0 100644 --- a/src/main/java/org/killbill/billing/catalog/api/TimeUnit.java +++ b/src/main/java/org/killbill/billing/catalog/api/TimeUnit.java @@ -16,7 +16,7 @@ package org.killbill.billing.catalog.api; -import javax.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnum; @XmlEnum public enum TimeUnit { From 9dc60c6e0805e5111d841a7cc2d5cfa3ad25af35 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Wed, 15 Apr 2026 04:47:57 +0700 Subject: [PATCH 4/7] use correct secret variables --- .github/workflows/snapshot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 76c2a88..cd51d66 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@java21 secrets: - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_PASS: ${{ secrets.OSSRH_PASS }} + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} From 527f120a7d305960b1b3bd73dddaa22cd2155e60 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Tue, 21 Apr 2026 07:28:37 +0700 Subject: [PATCH 5/7] nit: ignore /.codex file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fa61254..90db10d 100644 --- a/.gitignore +++ b/.gitignore @@ -229,3 +229,4 @@ Temporary Items *.tmproj *.tmproject tmtags +/.codex From 816cbb60958772bc7853208a927bc9dbb840ec22 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Fri, 24 Apr 2026 17:09:10 +0700 Subject: [PATCH 6/7] update release.yml to use latest actions --- .github/workflows/release.yml | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3e0791a..f555e62 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,11 +22,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 @@ -38,14 +38,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 - - 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/"}]' + 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,19 +60,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@v5 with: - java-version: 11 - server-id: ossrh-releases - server-username: OSSRH_USER - server-password: OSSRH_PASS + 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: - 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: | @@ -84,8 +81,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. From 839338be91f9b3976fcf40f9873694d264532b7c Mon Sep 17 00:00:00 2001 From: xsalefter Date: Wed, 17 Jun 2026 04:00:56 +0700 Subject: [PATCH 7/7] remove jakarta.activation-api --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index 7e2a291..4e51168 100644 --- a/pom.xml +++ b/pom.xml @@ -42,14 +42,6 @@ true spotbugs-exclude.xml - - - - jakarta.activation - jakarta.activation-api - - - com.fasterxml.jackson.core