From 399ed1466dd5865fcf3a01135b845bcfba9e5e66 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 8 May 2026 19:26:01 +0000 Subject: [PATCH 01/11] Migrate to Jakarta EE, update jooby coordinates, bump parent to 0.147.0-9c99329-SNAPSHOT, update CI to snapshot.yml@java21 Agent-Logs-Url: https://github.com/killbill/killbill-payment-test-plugin/sessions/49601aff-48a7-43cb-9d5e-962be9d8c34e Co-authored-by: xsalefter <510438+xsalefter@users.noreply.github.com> --- .github/workflows/ci.yml | 20 +++++-------------- .github/workflows/codeql-analysis.yml | 2 +- pom.xml | 10 +++++----- .../plugin/payment/PaymentTestActivator.java | 4 ++-- .../resources/PaymentTestResource.java | 4 ++-- 5 files changed, 15 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a054ecc..30fb3a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,20 +4,10 @@ on: push: pull_request: workflow_dispatch: - inputs: - jdk-matrix: - description: 'jdk matrix as json array' - required: false - default: '[ "11" ]' jobs: - ci: - uses: killbill/gh-actions-shared/.github/workflows/ci.yml@main - - integration_test: - uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@main - with: - plugin_name: 'payment-test' - integration_tests_goal: 'test:plugins:payment-test' - ddl_file: 'src/main/resources/ddl.sql' - integration_tests_ref: 'refs/heads/master' + snapshot: + 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/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/pom.xml b/pom.xml index 61d96cc..859e817 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.kill-bill.billing killbill-oss-parent - 0.146.63 + 0.147.0-9c99329-SNAPSHOT org.kill-bill.billing.plugin.java payment-test-plugin @@ -72,8 +72,8 @@ provided - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api joda-time @@ -91,8 +91,8 @@ provided - org.jooby - jooby + org.kill-bill.commons + killbill-jooby org.jooq diff --git a/src/main/java/org/killbill/billing/plugin/payment/PaymentTestActivator.java b/src/main/java/org/killbill/billing/plugin/payment/PaymentTestActivator.java index 8da388e..8f54606 100644 --- a/src/main/java/org/killbill/billing/plugin/payment/PaymentTestActivator.java +++ b/src/main/java/org/killbill/billing/plugin/payment/PaymentTestActivator.java @@ -16,8 +16,8 @@ package org.killbill.billing.plugin.payment; -import javax.servlet.Servlet; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.Servlet; +import jakarta.servlet.http.HttpServlet; import java.util.Hashtable; import org.killbill.billing.osgi.api.OSGIPluginProperties; import org.killbill.billing.osgi.libs.killbill.KillbillActivatorBase; diff --git a/src/main/java/org/killbill/billing/plugin/payment/resources/PaymentTestResource.java b/src/main/java/org/killbill/billing/plugin/payment/resources/PaymentTestResource.java index 8ceebed..f34ed1d 100644 --- a/src/main/java/org/killbill/billing/plugin/payment/resources/PaymentTestResource.java +++ b/src/main/java/org/killbill/billing/plugin/payment/resources/PaymentTestResource.java @@ -26,8 +26,8 @@ import org.killbill.billing.plugin.payment.TestingStates; import org.killbill.billing.plugin.payment.model.Payload; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @Path("/") From 2376d4b16c2aa0e33a28de41901fb3c48d3734ed Mon Sep 17 00:00:00 2001 From: xsalefter Date: Tue, 12 May 2026 03:11:27 +0700 Subject: [PATCH 02/11] exclude killbill-jooby dependency from killbill-base-plugin --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index 859e817..9ec95a1 100644 --- a/pom.xml +++ b/pom.xml @@ -142,12 +142,24 @@ org.kill-bill.billing.plugin.java killbill-base-plugin + + + org.kill-bill.commons + killbill-jooby + + org.kill-bill.billing.plugin.java killbill-base-plugin test-jar test + + + org.kill-bill.commons + killbill-jooby + + org.kill-bill.commons From a0616a480ff6e538470b2fb5ee385e79a822b570 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Tue, 12 May 2026 03:26:40 +0700 Subject: [PATCH 03/11] make TestingStates final as reported by spotbugs Medium: Exception thrown in class org.killbill.billing.plugin.payment.TestingStates at new org.killbill.billing.plugin.payment.TestingStates() will leave the constructor. The object under construction remains partially initialized and may be vulnerable to Finalizer attacks. --- .../java/org/killbill/billing/plugin/payment/TestingStates.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/killbill/billing/plugin/payment/TestingStates.java b/src/main/java/org/killbill/billing/plugin/payment/TestingStates.java index 28d766d..32b8f6e 100644 --- a/src/main/java/org/killbill/billing/plugin/payment/TestingStates.java +++ b/src/main/java/org/killbill/billing/plugin/payment/TestingStates.java @@ -28,7 +28,7 @@ import javax.annotation.Nullable; -public class TestingStates { +public final class TestingStates { public static final String SLEEP_PLUGIN_CONFIG_PARAM = "sleepFor"; public static final String AMOUNT_PLUGIN_CONFIG_PARAM = "amount"; From 89a28a3f8520e94ae5841c67156dd1eef2e35ae1 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Tue, 12 May 2026 04:12:57 +0700 Subject: [PATCH 04/11] fix ci.yml using wrong workflow file --- .github/workflows/ci.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30fb3a3..5294767 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,10 +4,20 @@ on: push: pull_request: workflow_dispatch: + inputs: + jdk-matrix: + description: 'jdk matrix as json array' + required: false + default: '[ "21" ]' jobs: - snapshot: - uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@java21 - secrets: - MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + ci: + uses: killbill/gh-actions-shared/.github/workflows/ci.yml@java21 + + integration_test: + uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@java21 + with: + plugin_name: 'payment-test' + integration_tests_goal: 'test:plugins:payment-test' + ddl_file: 'src/main/resources/ddl.sql' + integration_tests_ref: 'refs/heads/master' From 1fdfc52f95dd598f8bb4caaac0f5245144d2251b Mon Sep 17 00:00:00 2001 From: xsalefter Date: Wed, 13 May 2026 18:05:37 +0700 Subject: [PATCH 05/11] update docker-compose to use snapshot docker --- docker/docker-compose.ci.mysql.yml | 2 +- docker/docker-compose.ci.postgresql.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/docker-compose.ci.mysql.yml b/docker/docker-compose.ci.mysql.yml index 7e7ac6c..cf6d7ab 100644 --- a/docker/docker-compose.ci.mysql.yml +++ b/docker/docker-compose.ci.mysql.yml @@ -20,7 +20,7 @@ version: '3.8' services: killbill: network_mode: host - image: killbill/killbill:0.24.0 + image: xsalefter/killbill:0.25.1 environment: - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml - KILLBILL_DAO_URL=jdbc:mysql://127.0.0.1:3306/killbill diff --git a/docker/docker-compose.ci.postgresql.yml b/docker/docker-compose.ci.postgresql.yml index 006d24b..e8dc97a 100644 --- a/docker/docker-compose.ci.postgresql.yml +++ b/docker/docker-compose.ci.postgresql.yml @@ -20,7 +20,7 @@ version: '3.8' services: killbill: network_mode: host - image: killbill/killbill:0.24.0 + image: xsalefter/killbill:0.25.1 environment: - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml - KILLBILL_DAO_URL=jdbc:postgresql://127.0.0.1:5432/killbill From 01bb7e97d6f9f283f0478d833c1af47f8409ccda Mon Sep 17 00:00:00 2001 From: xsalefter Date: Thu, 14 May 2026 00:31:19 +0700 Subject: [PATCH 06/11] update project version to 9.0.0 --- README.md | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 98aac8b..72540cf 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ Kill Bill compatibility | 6.x.y | 0.20.z | | 7.x.y | 0.22.z | | 8.x.y | 0.24.z | +| 9.x.y | 0.26.z | Requirements diff --git a/pom.xml b/pom.xml index 9ec95a1..05586d0 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.kill-bill.billing.plugin.java payment-test-plugin - 8.0.2-SNAPSHOT + 9.0.0-SNAPSHOT bundle Kill Bill Payment Test plugin Kill Bill Payment Test plugin From bd16f065f13e6be792b412b242bda56d6cc90dfe Mon Sep 17 00:00:00 2001 From: xsalefter Date: Wed, 22 Jul 2026 23:23:56 +0700 Subject: [PATCH 07/11] update to killbill-oss-parent:0.147.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 05586d0..69b15a9 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.kill-bill.billing killbill-oss-parent - 0.147.0-9c99329-SNAPSHOT + 0.147.12 org.kill-bill.billing.plugin.java payment-test-plugin From aee98cf36daf8aa43261f5d9cb9f8fd914036e88 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Thu, 23 Jul 2026 03:40:51 +0700 Subject: [PATCH 08/11] add snapshot.yml workflow file --- .github/workflows/snapshot.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/workflows/snapshot.yml diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml new file mode 100644 index 0000000..cd51d66 --- /dev/null +++ b/.github/workflows/snapshot.yml @@ -0,0 +1,12 @@ +name: snapshot + +on: + push: + workflow_dispatch: + +jobs: + snapshot: + uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@java21 + secrets: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} From 6b0686d9f0cd10bc9b7c8db81d90340b4bac9b3f Mon Sep 17 00:00:00 2001 From: xsalefter Date: Thu, 13 Aug 2026 20:17:47 +0700 Subject: [PATCH 09/11] add notes about javax to jakarta migration --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 72540cf..a0702fa 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,9 @@ Kill Bill compatibility Requirements ----------------------- -The plugin needs a database. The latest version of the schema can be found [here](https://github.com/killbill/killbill-payment-test-plugin/blob/master/src/main/resources/ddl.sql). +The plugin needs a database. The latest version of the schema can be found [here](https://github.com/killbill/killbill-payment-test-plugin/blob/master/src/main/resources/ddl.sql). + +Version `9.x.y` mark of removal Java EE `javax` namespace and use `jakarta` namespace instead. ## Build From 5069133b20490ebc84eb391021efa69e708db6c6 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Thu, 13 Aug 2026 20:17:59 +0700 Subject: [PATCH 10/11] update to killbill-oss-parent:0.147.20 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 69b15a9..7c69530 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.kill-bill.billing killbill-oss-parent - 0.147.12 + 0.147.20 org.kill-bill.billing.plugin.java payment-test-plugin From 4ab3168220100e97cfd618d3d1499dafd5764cdb Mon Sep 17 00:00:00 2001 From: xsalefter Date: Thu, 13 Aug 2026 20:18:12 +0700 Subject: [PATCH 11/11] update docker-compose to use snapshot docker --- docker/docker-compose.ci.mysql.yml | 2 +- docker/docker-compose.ci.postgresql.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/docker-compose.ci.mysql.yml b/docker/docker-compose.ci.mysql.yml index cf6d7ab..403607c 100644 --- a/docker/docker-compose.ci.mysql.yml +++ b/docker/docker-compose.ci.mysql.yml @@ -20,7 +20,7 @@ version: '3.8' services: killbill: network_mode: host - image: xsalefter/killbill:0.25.1 + image: xsalefter/killbill:0.25.4 environment: - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml - KILLBILL_DAO_URL=jdbc:mysql://127.0.0.1:3306/killbill diff --git a/docker/docker-compose.ci.postgresql.yml b/docker/docker-compose.ci.postgresql.yml index e8dc97a..8b8ed64 100644 --- a/docker/docker-compose.ci.postgresql.yml +++ b/docker/docker-compose.ci.postgresql.yml @@ -20,7 +20,7 @@ version: '3.8' services: killbill: network_mode: host - image: xsalefter/killbill:0.25.1 + image: xsalefter/killbill:0.25.4 environment: - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml - KILLBILL_DAO_URL=jdbc:postgresql://127.0.0.1:5432/killbill