From 4175cdff0cc9f883a4c45566486a7a147c4a6e54 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 8 May 2026 19:18:03 +0000 Subject: [PATCH 01/10] Migrate to Jakarta EE namespace, update killbill-oss-parent to 0.147.0-9c99329-SNAPSHOT, update jooby to killbill-jooby, and update CI workflows to java21 Agent-Logs-Url: https://github.com/killbill/killbill-catalog-plugin-test/sessions/f7adba2e-6786-41a2-8100-04a58818c6ca Co-authored-by: xsalefter <510438+xsalefter@users.noreply.github.com> --- .github/workflows/ci.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 2 +- pom.xml | 10 +++++----- .../billing/plugin/catalog/CatalogActivator.java | 4 ++-- .../plugin/catalog/CatalogTestHealthcheckServlet.java | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06186a5..9edbfea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,10 +7,10 @@ on: jobs: ci: - uses: killbill/gh-actions-shared/.github/workflows/ci.yml@main + uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@java21 integration_test: - uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@main + uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@java21 with: plugin_name: 'catalog-test' integration_tests_goal: 'test:plugins:catalog-test' 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 1273035..4b6c6cd 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.billing killbill-oss-parent - 0.146.63 + 0.147.0-9c99329-SNAPSHOT org.kill-bill.billing.plugin.java catalog-test-plugin @@ -89,8 +89,8 @@ provided - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api joda-time @@ -101,8 +101,8 @@ org.apache.felix.framework - org.jooby - jooby + org.kill-bill.commons + killbill-jooby org.kill-bill.billing diff --git a/src/main/java/org/killbill/billing/plugin/catalog/CatalogActivator.java b/src/main/java/org/killbill/billing/plugin/catalog/CatalogActivator.java index d27b191..cb3ad3b 100644 --- a/src/main/java/org/killbill/billing/plugin/catalog/CatalogActivator.java +++ b/src/main/java/org/killbill/billing/plugin/catalog/CatalogActivator.java @@ -33,8 +33,8 @@ import java.util.Hashtable; -import javax.servlet.Servlet; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.Servlet; +import jakarta.servlet.http.HttpServlet; public class CatalogActivator extends KillbillActivatorBase { diff --git a/src/main/java/org/killbill/billing/plugin/catalog/CatalogTestHealthcheckServlet.java b/src/main/java/org/killbill/billing/plugin/catalog/CatalogTestHealthcheckServlet.java index b249ba8..10481bf 100644 --- a/src/main/java/org/killbill/billing/plugin/catalog/CatalogTestHealthcheckServlet.java +++ b/src/main/java/org/killbill/billing/plugin/catalog/CatalogTestHealthcheckServlet.java @@ -19,8 +19,8 @@ import java.util.Optional; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jooby.Result; import org.jooby.mvc.GET; From 4174067852481aae02883eca2d2ed27210e98f80 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Sat, 9 May 2026 03:43:57 +0700 Subject: [PATCH 02/10] update swagger `@ApiModel` to `@Schema` --- .../catalog/json/formats/CatalogJson.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/killbill/billing/plugin/catalog/json/formats/CatalogJson.java b/src/main/java/org/killbill/billing/plugin/catalog/json/formats/CatalogJson.java index cfd1f71..add76a0 100644 --- a/src/main/java/org/killbill/billing/plugin/catalog/json/formats/CatalogJson.java +++ b/src/main/java/org/killbill/billing/plugin/catalog/json/formats/CatalogJson.java @@ -24,14 +24,14 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.swagger.annotations.ApiModel; +import io.swagger.v3.oas.annotations.media.Schema; import org.killbill.billing.catalog.api.Currency; import org.killbill.billing.catalog.api.*; import java.math.BigDecimal; import java.util.*; -@ApiModel(value = "Catalog") +@Schema(name = "Catalog") public class CatalogJson { private final String name; @@ -190,7 +190,7 @@ public int hashCode() { return result; } - @ApiModel(value = "Unit") + @Schema(name = "Unit") public static class UnitJson { private final String name; @@ -240,7 +240,7 @@ public int hashCode() { } - @ApiModel(value = "Product") + @Schema(name = "Product") public static class ProductJson { private final String type; @@ -362,7 +362,7 @@ public String apply(final Product input) { } } - @ApiModel(value = "Plan") + @Schema(name = "Plan") public static class PlanJson { private final String name; @@ -454,7 +454,7 @@ public int hashCode() { } } - @ApiModel(value = "TieredBlock") + @Schema(name = "TieredBlock") public static class TieredBlockJson { private final String unit; private final String size; @@ -536,7 +536,7 @@ public int hashCode() { } } - @ApiModel(value = "Limit") + @Schema(name = "Limit") public static class LimitJson { private final String unit; private final String max; @@ -606,7 +606,7 @@ public int hashCode() { } } - @ApiModel(value = "Tier") + @Schema(name = "Tier") public static class TierJson { private final List blocks; private final List limits; @@ -688,7 +688,7 @@ public int hashCode() { } } - @ApiModel(value = "Usage") + @Schema(name = "Usage") public static class UsageJson { private final String billingPeriod; private final List tiers; @@ -746,7 +746,7 @@ public int hashCode() { } } - @ApiModel(value = "Phase") + @Schema(name = "Phase") public static class PhaseJson { private final String type; @@ -913,7 +913,7 @@ private List buildTieredBlocks(final TieredBlock[] tieredBlocks } - @ApiModel(value = "Price") + @Schema(name = "Price") public static class PriceJson { private final Currency currency; @@ -976,7 +976,7 @@ public int hashCode() { } } - @ApiModel(value = "PriceList") + @Schema(name = "PriceList") public static class PriceListJson { private String name; @@ -1042,7 +1042,7 @@ public int hashCode() { } - @ApiModel(value = "Duration") + @Schema(name = "Duration") public static class DurationJson { private final TimeUnit unit; From 0479c23784bfb30f13c16e8e60bd6126176d86ce Mon Sep 17 00:00:00 2001 From: xsalefter Date: Sat, 9 May 2026 03:45:23 +0700 Subject: [PATCH 03/10] fix various dependency mismatch --- pom.xml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 4b6c6cd..0efd817 100644 --- a/pom.xml +++ b/pom.xml @@ -80,18 +80,18 @@ guice - io.swagger - swagger-annotations + io.swagger.core.v3 + swagger-annotations-jakarta + + + jakarta.inject + jakarta.inject-api jakarta.servlet jakarta.servlet-api provided - - jakarta.inject - jakarta.inject-api - joda-time joda-time @@ -100,10 +100,6 @@ org.apache.felix org.apache.felix.framework - - org.kill-bill.commons - killbill-jooby - org.kill-bill.billing killbill-api @@ -145,6 +141,17 @@ org.kill-bill.billing.plugin.java killbill-base-plugin + + + + org.kill-bill.commons + killbill-jooby + + + + + org.kill-bill.commons + killbill-jooby org.kill-bill.commons From ddc336753f9559cba1a2f28c23b7dc5113fa74f5 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Tue, 12 May 2026 04:10:36 +0700 Subject: [PATCH 04/10] fix wrong workflows for ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9edbfea..65ac4a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: jobs: ci: - uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@java21 + uses: killbill/gh-actions-shared/.github/workflows/ci.yml@java21 integration_test: uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@java21 From 2c3b55a9916bbc7babb4e20fe47f5b139f99852b Mon Sep 17 00:00:00 2001 From: xsalefter Date: Wed, 13 May 2026 00:50:21 +0700 Subject: [PATCH 05/10] update killbill.version and exclude redisson from killbill-catalog --- pom.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0efd817..aac201e 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ true - 0.24.0 + 0.26.0-52c0186-SNAPSHOT false org.killbill.xmlloader;version=0.0.0, javax.xml.bind;version=0.0.0, @@ -108,6 +108,14 @@ org.kill-bill.billing killbill-catalog + + + + org.redisson + redisson + + org.kill-bill.billing From f2940ca077870b4894151a70799579c3224afb50 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Wed, 13 May 2026 17:59:17 +0700 Subject: [PATCH 06/10] 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 e3bfff7..459e97f 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 f38178a..6f92111 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 d56e6e79016e1574f01aedaacb01763c1d6bd4b9 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Thu, 14 May 2026 00:32:18 +0700 Subject: [PATCH 07/10] update artifact version to 0.6.0 --- README.md | 11 ++++++----- pom.xml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a41896e..9ac574a 100644 --- a/README.md +++ b/README.md @@ -17,11 +17,12 @@ Kill Bill compatibility | Plugin version | Kill Bill version | -| -------------: | ----------------: | -| 0.2.y | 0.18.z | -| 0.3.y | 0.20.z | -| 0.4.y | 0.22.z | -| 0.5.y | 0.24.z | +|---------------:|------------------:| +| 0.2.y | 0.18.z | +| 0.3.y | 0.20.z | +| 0.4.y | 0.22.z | +| 0.5.y | 0.24.z | +| 0.6.y | 0.26.z | ## Requirements diff --git a/pom.xml b/pom.xml index aac201e..cf16126 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.kill-bill.billing.plugin.java catalog-test-plugin - 0.5.3-SNAPSHOT + 0.6.0-SNAPSHOT bundle Test Plugin for CatalogPluginApi Test Plugin for CatalogPluginApi From 81ac5ee7fc66f2adaf83fd489a0e8dd8c299ac5a Mon Sep 17 00:00:00 2001 From: xsalefter Date: Wed, 22 Jul 2026 23:21:16 +0700 Subject: [PATCH 08/10] 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 cf16126..48fff2b 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.billing killbill-oss-parent - 0.147.0-9c99329-SNAPSHOT + 0.147.12 org.kill-bill.billing.plugin.java catalog-test-plugin From d0a547e11cca371fdf163384763631b935b1b9a4 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Thu, 23 Jul 2026 01:29:05 +0700 Subject: [PATCH 09/10] set killbill-utils scope to runtime and remove unused osgi.export item --- pom.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 48fff2b..288da7e 100644 --- a/pom.xml +++ b/pom.xml @@ -43,13 +43,11 @@ true - 0.26.0-52c0186-SNAPSHOT + 0.25.1 false org.killbill.xmlloader;version=0.0.0, javax.xml.bind;version=0.0.0, org.killbill.commons.concurrent;version=0.0.0, - org.killbill.commons.utils;version=0.0.0, - org.killbill.commons.utils.io;version=0.0.0, org.killbill.billing.util.config.definition;version=0.0.0 org.killbill.billing.plugin.catalog.* @@ -164,7 +162,7 @@ org.kill-bill.commons killbill-utils - provided + runtime org.slf4j From 4cb44b0ca7d7c2da73cf31115faa6c1d29af3930 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Fri, 24 Jul 2026 02:10:18 +0700 Subject: [PATCH 10/10] add snapshot.yml --- .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 }}