From 19efdd0c685ff16552ab8eb92b6351efb59fe476 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Fri, 22 May 2026 02:18:55 +0700 Subject: [PATCH 01/12] update version, oss-version and README.md --- README.md | 2 ++ pom.xml | 49 ++++++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 17f66c0..e7c358f 100644 --- a/README.md +++ b/README.md @@ -16,12 +16,14 @@ Kill Bill plugin to provide business analytics and reporting capabilities. You c | 7.1.y | 0.22.z | | 7.2.y | 0.22.z | | 8.0.y | 0.24.z | +| 9.0.y | 0.26.z | ### Release notes * Starting with `7.2.0`, the configuration is using a YAML format, instead of key-value pairs. * We've upgraded numerous dependencies in `7.1.x` (required for Java 11 support). * Version `8.1.0` of the plugin includes a DDL change. So, upgrading to this version requires running [this](https://github.com/killbill/killbill-analytics-plugin/blob/63c968f46001c7662d46464e608304c5bcd003bc/src/main/resources/migration/V20230712110325__rename_value_to_field_value_in_all_tables.sql) migration. +* Version `9.0.x` mark of removal Java EE `javax` namespace and one need to use jakarta namespace instead. ## Requirements diff --git a/pom.xml b/pom.xml index 62a5eaf..ba29520 100644 --- a/pom.xml +++ b/pom.xml @@ -22,11 +22,11 @@ org.kill-bill.billing killbill-oss-parent - 0.146.63 + 0.147.0-9c99329-SNAPSHOT org.kill-bill.billing.plugin.java analytics-plugin - 8.1.5-SNAPSHOT + 9.0.0-SNAPSHOT bundle Kill Bill OSGI Analytics bundle Kill Bill Analytics plugin @@ -47,15 +47,6 @@ false org.killbill.billing.plugin.analytics.* - - - - org.reactivestreams - reactive-streams - 1.0.3 - - - com.bpodgursky @@ -86,10 +77,6 @@ com.github.spotbugs spotbugs-annotations - - com.google.code.findbugs - jsr305 - com.google.guava guava @@ -114,15 +101,19 @@ embedded-postgres test + + jakarta.annotation + jakarta.annotation-api + + + jakarta.inject + jakarta.inject-api + jakarta.servlet jakarta.servlet-api provided - - javax.inject - javax.inject - joda-time joda-time @@ -158,10 +149,6 @@ log4jdbc-log4j2-jdbc4 test - - org.jooby - jooby - org.jooq jooq @@ -201,12 +188,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 @@ -245,6 +244,10 @@ org.kill-bill.commons killbill-jdbi + + org.kill-bill.commons + killbill-jooby + org.kill-bill.commons killbill-locker From e64cbf545799374d84b0d8d94158a1a1b7651349 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Fri, 22 May 2026 02:20:31 +0700 Subject: [PATCH 02/12] update source code to use jakarta namespace --- .../billing/plugin/analytics/AnalyticsActivator.java | 4 ++-- .../billing/plugin/analytics/AnalyticsListener.java | 2 +- .../billing/plugin/analytics/core/AnalyticsHealthcheck.java | 2 +- .../billing/plugin/analytics/dao/BusinessInvoiceDao.java | 2 +- .../plugin/analytics/dao/factory/BusinessFactoryBase.java | 2 +- .../analytics/dao/factory/BusinessInvoiceFactory.java | 2 +- .../dao/factory/BusinessSubscriptionTransitionFactory.java | 2 +- .../analytics/dao/factory/PluginPropertiesManager.java | 2 +- .../analytics/dao/model/BusinessAccountFieldModelDao.java | 2 +- .../plugin/analytics/dao/model/BusinessAccountModelDao.java | 2 +- .../analytics/dao/model/BusinessAccountTagModelDao.java | 2 +- .../dao/model/BusinessAccountTransitionModelDao.java | 2 +- .../analytics/dao/model/BusinessBundleFieldModelDao.java | 2 +- .../plugin/analytics/dao/model/BusinessBundleModelDao.java | 2 +- .../analytics/dao/model/BusinessBundleTagModelDao.java | 2 +- .../plugin/analytics/dao/model/BusinessFieldModelDao.java | 2 +- .../dao/model/BusinessInvoiceAdjustmentModelDao.java | 2 +- .../analytics/dao/model/BusinessInvoiceFieldModelDao.java | 2 +- .../dao/model/BusinessInvoiceItemAdjustmentModelDao.java | 2 +- .../dao/model/BusinessInvoiceItemBaseModelDao.java | 2 +- .../dao/model/BusinessInvoiceItemCreditModelDao.java | 2 +- .../analytics/dao/model/BusinessInvoiceItemModelDao.java | 2 +- .../plugin/analytics/dao/model/BusinessInvoiceModelDao.java | 2 +- .../dao/model/BusinessInvoicePaymentFieldModelDao.java | 2 +- .../dao/model/BusinessInvoicePaymentTagModelDao.java | 2 +- .../analytics/dao/model/BusinessInvoiceTagModelDao.java | 2 +- .../plugin/analytics/dao/model/BusinessModelDaoBase.java | 2 +- .../analytics/dao/model/BusinessPaymentAuthModelDao.java | 2 +- .../analytics/dao/model/BusinessPaymentBaseModelDao.java | 2 +- .../analytics/dao/model/BusinessPaymentCaptureModelDao.java | 2 +- .../dao/model/BusinessPaymentChargebackModelDao.java | 2 +- .../analytics/dao/model/BusinessPaymentCreditModelDao.java | 2 +- .../analytics/dao/model/BusinessPaymentFieldModelDao.java | 2 +- .../dao/model/BusinessPaymentMethodFieldModelDao.java | 2 +- .../dao/model/BusinessPaymentPurchaseModelDao.java | 2 +- .../analytics/dao/model/BusinessPaymentRefundModelDao.java | 2 +- .../analytics/dao/model/BusinessPaymentVoidModelDao.java | 2 +- .../plugin/analytics/dao/model/BusinessSubscription.java | 2 +- .../analytics/dao/model/BusinessSubscriptionEvent.java | 2 +- .../dao/model/BusinessSubscriptionTransitionModelDao.java | 2 +- .../plugin/analytics/dao/model/BusinessTagModelDao.java | 2 +- .../dao/model/BusinessTransactionFieldModelDao.java | 2 +- .../plugin/analytics/http/AnalyticsAccountResource.java | 6 +++--- .../plugin/analytics/http/AnalyticsHealthcheckResource.java | 6 +++--- .../billing/plugin/analytics/http/BaseResource.java | 2 +- .../billing/plugin/analytics/http/ReportsResource.java | 6 +++--- .../killbill/billing/plugin/analytics/json/FieldJson.java | 2 +- .../plugin/analytics/json/ReportConfigurationJson.java | 2 +- .../killbill/billing/plugin/analytics/json/SchemaJson.java | 2 +- .../billing/plugin/analytics/reports/QueryEngine.java | 2 +- .../billing/plugin/analytics/reports/ReportsUserApi.java | 2 +- .../plugin/analytics/reports/SqlReportDataExtractor.java | 2 +- .../billing/plugin/analytics/reports/analysis/Smoother.java | 2 +- .../reports/configuration/ReportsConfigurationModelDao.java | 2 +- .../plugin/analytics/reports/scheduler/JobsScheduler.java | 2 +- .../billing/plugin/analytics/reports/sql/Metadata.java | 2 +- .../billing/plugin/analytics/reports/sql/TableMetadata.java | 2 +- .../plugin/analytics/utils/BusinessInvoiceItemUtils.java | 2 +- .../plugin/analytics/utils/BusinessInvoiceUtils.java | 2 +- .../billing/plugin/analytics/utils/CurrencyConverter.java | 2 +- .../billing/plugin/analytics/utils/PaymentUtils.java | 2 +- .../billing/plugin/analytics/AnalyticsTestSuiteNoDB.java | 2 +- .../analytics/reports/TestSqlReportDataExtractor.java | 2 +- 63 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsActivator.java b/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsActivator.java index a12e3fd..28ad388 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsActivator.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsActivator.java @@ -23,8 +23,8 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; -import javax.servlet.Servlet; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.Servlet; +import jakarta.servlet.http.HttpServlet; import org.killbill.billing.osgi.api.Healthcheck; import org.killbill.billing.osgi.api.OSGIPluginProperties; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsListener.java b/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsListener.java index be847a2..3c44a96 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsListener.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsListener.java @@ -25,7 +25,7 @@ import java.util.UUID; import java.util.concurrent.Executor; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.killbill.billing.ObjectType; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/core/AnalyticsHealthcheck.java b/src/main/java/org/killbill/billing/plugin/analytics/core/AnalyticsHealthcheck.java index d4cf3db..1148eb1 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/core/AnalyticsHealthcheck.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/core/AnalyticsHealthcheck.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.osgi.api.Healthcheck; import org.killbill.billing.plugin.analytics.AnalyticsListener; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/BusinessInvoiceDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/BusinessInvoiceDao.java index 0f13f57..56782df 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/BusinessInvoiceDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/BusinessInvoiceDao.java @@ -25,7 +25,7 @@ import java.util.UUID; import java.util.concurrent.Executor; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.invoice.api.InvoiceStatus; import org.killbill.billing.osgi.libs.killbill.OSGIKillbillDataSource; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessFactoryBase.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessFactoryBase.java index 5b88638..af06b56 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessFactoryBase.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessFactoryBase.java @@ -27,7 +27,7 @@ import java.util.Objects; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.killbill.billing.ErrorCode; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessInvoiceFactory.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessInvoiceFactory.java index 8e35b65..dcaf431 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessInvoiceFactory.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessInvoiceFactory.java @@ -32,7 +32,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.ExecutorCompletionService; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.catalog.api.Plan; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessSubscriptionTransitionFactory.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessSubscriptionTransitionFactory.java index a62bd5a..3a2afc3 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessSubscriptionTransitionFactory.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessSubscriptionTransitionFactory.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.entitlement.api.SubscriptionBundle; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/PluginPropertiesManager.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/PluginPropertiesManager.java index 0101a3f..d29d3f8 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/PluginPropertiesManager.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/PluginPropertiesManager.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.dao.factory; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.payment.api.PaymentMethod; import org.killbill.billing.payment.api.PaymentTransaction; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountFieldModelDao.java index e422604..3f29476 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountFieldModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountFieldModelDao.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.dao.model; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.util.audit.AuditLog; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountModelDao.java index d5de24f..7258581 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountModelDao.java @@ -22,7 +22,7 @@ import java.math.BigDecimal; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.joda.time.LocalDate; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTagModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTagModelDao.java index 49dbad6..69ade39 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTagModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTagModelDao.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.dao.model; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.util.audit.AuditLog; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTransitionModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTransitionModelDao.java index 57bbcc2..6ac1f15 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTransitionModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessAccountTransitionModelDao.java @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.killbill.billing.account.api.Account; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleFieldModelDao.java index 4946ecc..b35222f 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleFieldModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleFieldModelDao.java @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.entitlement.api.SubscriptionBundle; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleModelDao.java index 18ff696..5283faf 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleModelDao.java @@ -22,7 +22,7 @@ import java.math.BigDecimal; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.joda.time.LocalDate; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleTagModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleTagModelDao.java index fea9bb0..149ff1b 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleTagModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessBundleTagModelDao.java @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.entitlement.api.SubscriptionBundle; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessFieldModelDao.java index 5323eb2..d47e475 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessFieldModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessFieldModelDao.java @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.killbill.billing.ObjectType; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceAdjustmentModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceAdjustmentModelDao.java index 953f702..60f468e 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceAdjustmentModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceAdjustmentModelDao.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.dao.model; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.catalog.api.Plan; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceFieldModelDao.java index d62b445..95f2a05 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceFieldModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceFieldModelDao.java @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.util.audit.AuditLog; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemAdjustmentModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemAdjustmentModelDao.java index 4d2605a..b4d65ca 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemAdjustmentModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemAdjustmentModelDao.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.dao.model; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.catalog.api.Plan; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemBaseModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemBaseModelDao.java index e71321f..c2b608a 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemBaseModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemBaseModelDao.java @@ -22,7 +22,7 @@ import java.math.BigDecimal; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.joda.time.LocalDate; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemCreditModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemCreditModelDao.java index 53975ab..5c4694a 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemCreditModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemCreditModelDao.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.dao.model; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.catalog.api.Plan; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemModelDao.java index d55cc70..007d32d 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceItemModelDao.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.dao.model; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.catalog.api.Plan; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceModelDao.java index 0b88809..12bf2cd 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceModelDao.java @@ -22,7 +22,7 @@ import java.math.BigDecimal; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.joda.time.LocalDate; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentFieldModelDao.java index bcb0c2d..3297b03 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentFieldModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentFieldModelDao.java @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.util.audit.AuditLog; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentTagModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentTagModelDao.java index f1d70aa..cfeb037 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentTagModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoicePaymentTagModelDao.java @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.util.audit.AuditLog; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceTagModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceTagModelDao.java index db42634..9116560 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceTagModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessInvoiceTagModelDao.java @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.util.audit.AuditLog; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessModelDaoBase.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessModelDaoBase.java index 308a3c0..00ecf37 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessModelDaoBase.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessModelDaoBase.java @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentAuthModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentAuthModelDao.java index d52fa99..426bbe8 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentAuthModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentAuthModelDao.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.dao.model; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.invoice.api.Invoice; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentBaseModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentBaseModelDao.java index 1a10a85..187931f 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentBaseModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentBaseModelDao.java @@ -22,7 +22,7 @@ import java.math.BigDecimal; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.joda.time.LocalDate; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCaptureModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCaptureModelDao.java index be719c2..15c8e7a 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCaptureModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCaptureModelDao.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.dao.model; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.invoice.api.Invoice; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentChargebackModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentChargebackModelDao.java index f95620d..0f73f90 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentChargebackModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentChargebackModelDao.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.dao.model; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.invoice.api.Invoice; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCreditModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCreditModelDao.java index 6916b8f..e2d34ec 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCreditModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentCreditModelDao.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.dao.model; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.invoice.api.Invoice; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentFieldModelDao.java index f32ec6b..fec19c9 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentFieldModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentFieldModelDao.java @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.util.audit.AuditLog; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentMethodFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentMethodFieldModelDao.java index 684dc4d..8b26ab3 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentMethodFieldModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentMethodFieldModelDao.java @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.util.audit.AuditLog; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentPurchaseModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentPurchaseModelDao.java index 892dd51..4251803 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentPurchaseModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentPurchaseModelDao.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.dao.model; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.invoice.api.Invoice; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentRefundModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentRefundModelDao.java index e006ee6..ae738bb 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentRefundModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentRefundModelDao.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.dao.model; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.invoice.api.Invoice; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentVoidModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentVoidModelDao.java index 4788f97..5ed039c 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentVoidModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessPaymentVoidModelDao.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.dao.model; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.invoice.api.Invoice; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscription.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscription.java index 4fb30f1..9d74f3f 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscription.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscription.java @@ -22,7 +22,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.killbill.billing.catalog.api.BillingPeriod; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionEvent.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionEvent.java index 66c4709..ed50c01 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionEvent.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionEvent.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.dao.model; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.catalog.api.Plan; import org.killbill.billing.catalog.api.Product; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionTransitionModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionTransitionModelDao.java index b672c35..6c9e931 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionTransitionModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessSubscriptionTransitionModelDao.java @@ -22,7 +22,7 @@ import java.math.BigDecimal; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.killbill.billing.account.api.Account; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTagModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTagModelDao.java index a5f07ed..202e2c2 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTagModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTagModelDao.java @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.killbill.billing.ObjectType; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTransactionFieldModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTransactionFieldModelDao.java index 4651d65..fb29c4a 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTransactionFieldModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/model/BusinessTransactionFieldModelDao.java @@ -21,7 +21,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.account.api.Account; import org.killbill.billing.util.audit.AuditLog; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsAccountResource.java b/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsAccountResource.java index 6ad3b31..7a1f4c2 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsAccountResource.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsAccountResource.java @@ -22,9 +22,9 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jooby.Result; import org.jooby.Results; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsHealthcheckResource.java b/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsHealthcheckResource.java index 9742022..29bc6f3 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsHealthcheckResource.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/http/AnalyticsHealthcheckResource.java @@ -21,9 +21,9 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jooby.Result; import org.jooby.Results; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/http/BaseResource.java b/src/main/java/org/killbill/billing/plugin/analytics/http/BaseResource.java index 6d98690..27d10cb 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/http/BaseResource.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/http/BaseResource.java @@ -22,7 +22,7 @@ import java.util.Optional; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.killbill.billing.osgi.libs.killbill.OSGIKillbillClock; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/http/ReportsResource.java b/src/main/java/org/killbill/billing/plugin/analytics/http/ReportsResource.java index c927fa3..8f6913c 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/http/ReportsResource.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/http/ReportsResource.java @@ -28,9 +28,9 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/json/FieldJson.java b/src/main/java/org/killbill/billing/plugin/analytics/json/FieldJson.java index 2e31e9f..4e5841b 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/json/FieldJson.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/json/FieldJson.java @@ -21,7 +21,7 @@ import java.util.List; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.jooq.Field; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/json/ReportConfigurationJson.java b/src/main/java/org/killbill/billing/plugin/analytics/json/ReportConfigurationJson.java index 91e2bfe..6678987 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/json/ReportConfigurationJson.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/json/ReportConfigurationJson.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.json; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.jooq.Field; import org.killbill.billing.plugin.analytics.reports.configuration.ReportsConfigurationModelDao; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/json/SchemaJson.java b/src/main/java/org/killbill/billing/plugin/analytics/json/SchemaJson.java index 4026be1..e500979 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/json/SchemaJson.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/json/SchemaJson.java @@ -21,7 +21,7 @@ import java.util.List; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.jooq.Field; import org.killbill.billing.plugin.analytics.reports.sql.TableMetadata; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/QueryEngine.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/QueryEngine.java index ab25d43..909dddb 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/reports/QueryEngine.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/QueryEngine.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Map.Entry; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/ReportsUserApi.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/ReportsUserApi.java index 8bcb439..56786c5 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/reports/ReportsUserApi.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/ReportsUserApi.java @@ -32,7 +32,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.killbill.billing.ObjectType; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/SqlReportDataExtractor.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/SqlReportDataExtractor.java index 90ee503..0803460 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/reports/SqlReportDataExtractor.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/SqlReportDataExtractor.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.LinkedList; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/analysis/Smoother.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/analysis/Smoother.java index a387ecc..6e66922 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/reports/analysis/Smoother.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/analysis/Smoother.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Map.Entry; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.joda.time.DateTimeConstants; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/configuration/ReportsConfigurationModelDao.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/configuration/ReportsConfigurationModelDao.java index 1e2d181..35376f4 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/reports/configuration/ReportsConfigurationModelDao.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/configuration/ReportsConfigurationModelDao.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.reports.configuration; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.plugin.analytics.json.ReportConfigurationJson; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/scheduler/JobsScheduler.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/scheduler/JobsScheduler.java index 9dd18ae..b471c02 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/reports/scheduler/JobsScheduler.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/scheduler/JobsScheduler.java @@ -28,7 +28,7 @@ import java.util.UUID; import java.util.concurrent.ExecutorService; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.killbill.billing.osgi.libs.killbill.OSGIKillbillDataSource; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/Metadata.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/Metadata.java index 23fa894..dec7e25 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/Metadata.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/Metadata.java @@ -28,7 +28,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import javax.sql.DataSource; import org.jooq.ConnectionCallable; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/TableMetadata.java b/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/TableMetadata.java index 904b0c4..8382963 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/TableMetadata.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/reports/sql/TableMetadata.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.jooq.Table; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceItemUtils.java b/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceItemUtils.java index 4916742..1df93f3 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceItemUtils.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceItemUtils.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.utils; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.LocalDate; import org.killbill.billing.catalog.api.PlanPhase; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceUtils.java b/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceUtils.java index eb0805e..8777da9 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceUtils.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/utils/BusinessInvoiceUtils.java @@ -22,7 +22,7 @@ import java.math.BigDecimal; import java.util.Collection; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.catalog.api.Currency; import org.killbill.billing.invoice.api.InvoiceItem; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyConverter.java b/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyConverter.java index 310cdfa..7359fb7 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyConverter.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyConverter.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.LocalDate; import org.killbill.billing.account.api.Account; diff --git a/src/main/java/org/killbill/billing/plugin/analytics/utils/PaymentUtils.java b/src/main/java/org/killbill/billing/plugin/analytics/utils/PaymentUtils.java index 6ed5e69..02ed765 100644 --- a/src/main/java/org/killbill/billing/plugin/analytics/utils/PaymentUtils.java +++ b/src/main/java/org/killbill/billing/plugin/analytics/utils/PaymentUtils.java @@ -23,7 +23,7 @@ import java.util.LinkedList; import java.util.List; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.payment.api.Payment; import org.killbill.billing.payment.api.PaymentTransaction; diff --git a/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteNoDB.java b/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteNoDB.java index 008321b..980b91b 100644 --- a/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteNoDB.java +++ b/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteNoDB.java @@ -25,7 +25,7 @@ import java.util.UUID; import java.util.concurrent.ExecutorService; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import javax.sql.DataSource; import org.joda.time.DateTime; diff --git a/src/test/java/org/killbill/billing/plugin/analytics/reports/TestSqlReportDataExtractor.java b/src/test/java/org/killbill/billing/plugin/analytics/reports/TestSqlReportDataExtractor.java index 3862c93..9a00d57 100644 --- a/src/test/java/org/killbill/billing/plugin/analytics/reports/TestSqlReportDataExtractor.java +++ b/src/test/java/org/killbill/billing/plugin/analytics/reports/TestSqlReportDataExtractor.java @@ -19,7 +19,7 @@ package org.killbill.billing.plugin.analytics.reports; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.DateTime; import org.joda.time.LocalDate; From 013f64a4730bde8fba952f196c70647d138f3a47 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Fri, 22 May 2026 02:21:08 +0700 Subject: [PATCH 03/12] update workflow files to latest actions and use java21 branch --- .github/workflows/ci.yml | 6 ++++-- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/release.yml | 13 +++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86d57f7..e44f3ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,10 +7,12 @@ on: jobs: ci: - uses: killbill/gh-actions-shared/.github/workflows/ci.yml@main + uses: killbill/gh-actions-shared/.github/workflows/ci.yml@java21 + with: + test-profile-matrix: '[ "travis", "integration-mysql", "integration-postgresql" ]' 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: 'analytics' integration_tests_goal: 'test:plugins:analytics' 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 c8bfeeb..938e146 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@v4 - name: Checkout full repository # Required when performing an existing release. if: github.event.inputs.perform_version != '' - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: '0' - name: Setup git user @@ -38,9 +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@v4 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: | @@ -59,9 +60,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@v4 with: - java-version: 11 + java-version: 21 distribution: temurin server-id: central server-username: MAVEN_USERNAME From 51537b58a35fd99d072491c44864c93f3e710fde Mon Sep 17 00:00:00 2001 From: xsalefter Date: Sun, 26 Jul 2026 03:38:22 +0700 Subject: [PATCH 04/12] 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 ba29520..d21dd12 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 analytics-plugin From 3746fa4a7f37e4a052bf4ca6c65a19ce8ce3c3d4 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Sun, 26 Jul 2026 03:38:39 +0700 Subject: [PATCH 05/12] 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 }} From 05f5572a32806d9f37adf0f48f011160809e1fad Mon Sep 17 00:00:00 2001 From: xsalefter Date: Wed, 12 Aug 2026 16:53:48 +0700 Subject: [PATCH 06/12] update to killbill-oss-parent:0.147.20, enable spotbugs check --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d21dd12..c5baf25 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.billing killbill-oss-parent - 0.147.12 + 0.147.20 org.kill-bill.billing.plugin.java analytics-plugin @@ -42,7 +42,7 @@ https://github.com/killbill/killbill-analytics-plugin/issues - false + true spotbugs-exclude.xml false org.killbill.billing.plugin.analytics.* From dd076df604cf1ccf83c742f348b84a8bdafbfdb8 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Wed, 12 Aug 2026 16:56:08 +0700 Subject: [PATCH 07/12] ignore more errors with justification --- spotbugs-exclude.xml | 81 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml index 915b376..320d21d 100644 --- a/spotbugs-exclude.xml +++ b/spotbugs-exclude.xml @@ -25,4 +25,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1170a12045187c5d63d265adf620413fb3cfb48e Mon Sep 17 00:00:00 2001 From: xsalefter Date: Wed, 2 Sep 2026 00:33:06 +0700 Subject: [PATCH 08/12] update cloudsmith_release.yml workflow target branch --- .github/workflows/cloudsmith_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cloudsmith_release.yml b/.github/workflows/cloudsmith_release.yml index e273798..fd77d88 100644 --- a/.github/workflows/cloudsmith_release.yml +++ b/.github/workflows/cloudsmith_release.yml @@ -5,7 +5,7 @@ on: jobs: cloudsmith_release: - uses: killbill/gh-actions-shared/.github/workflows/cloudsmith_release.yml@main + uses: killbill/gh-actions-shared/.github/workflows/cloudsmith_release.yml@java21 with: group_id: org.kill-bill.billing.plugin.java artifact_id: analytics-plugin From 31d2e49d4990f2490022985deedd137f138c3549 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Sat, 26 Sep 2026 07:08:45 +0700 Subject: [PATCH 09/12] update workflow files to support cloudsmith --- .github/workflows/ci.yml | 10 ++- .github/workflows/codeql-analysis.yml | 5 +- .github/workflows/release.yml | 89 ++++----------------------- .github/workflows/snapshot.yml | 8 ++- 4 files changed, 30 insertions(+), 82 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e44f3ae..e5b70f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,14 +7,20 @@ 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", "integration-mysql", "integration-postgresql" ]' + secrets: + CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }} + CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }} integration_test: - uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@java21 + uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@main with: plugin_name: 'analytics' integration_tests_goal: 'test:plugins:analytics' ddl_file: 'src/main/resources/org/killbill/billing/plugin/analytics/ddl.sql' integration_tests_ref: 'refs/heads/master' + secrets: + CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }} + CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b8add17..7d120c8 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 938e146..ee54732 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,81 +12,18 @@ on: required: false default: '' -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@v4 - - name: Checkout full repository - # Required when performing an existing release. - if: github.event.inputs.perform_version != '' - uses: actions/checkout@v4 - 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@v4 - 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@v4 - 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 + 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 cd51d66..d4ea57a 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 }} From 41e27fac1e62da21ba358f813a1bc226597d42b8 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Sat, 26 Sep 2026 07:09:18 +0700 Subject: [PATCH 10/12] remove duplicated cloudsmith_release.yml --- .github/workflows/cloudsmith_release.yml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .github/workflows/cloudsmith_release.yml diff --git a/.github/workflows/cloudsmith_release.yml b/.github/workflows/cloudsmith_release.yml deleted file mode 100644 index fd77d88..0000000 --- a/.github/workflows/cloudsmith_release.yml +++ /dev/null @@ -1,15 +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.billing.plugin.java - artifact_id: analytics-plugin - secrets: - CLOUDSMITH_REPO: ${{ secrets.CLOUDSMITH_REPO }} - CLOUDSMITH_USER: ${{ secrets.CLOUDSMITH_USER }} - CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }} From a3cd47b0cb69b0f65e91808b7a34c2006a1b3a31 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Sat, 26 Sep 2026 07:10:33 +0700 Subject: [PATCH 11/12] update parent and add repository.cloudsmith.repo --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c5baf25..a60b162 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.billing killbill-oss-parent - 0.147.20 + 0.147.30 org.kill-bill.billing.plugin.java analytics-plugin @@ -46,6 +46,8 @@ spotbugs-exclude.xml false org.killbill.billing.plugin.analytics.* + + killbill-analytics-plugin From 73ec973f31d3282eb6199edf97178602467ee872 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Sat, 26 Sep 2026 07:11:10 +0700 Subject: [PATCH 12/12] update 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 46f3b2d..7d98d77 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.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 9d41fa4..4e7f043 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.4 environment: - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml - KILLBILL_DAO_URL=jdbc:postgresql://127.0.0.1:5432/killbill