From e1fb0a86c94c14a09d76bdb35e19642a71b73252 Mon Sep 17 00:00:00 2001 From: stephane brossier Date: Tue, 28 Apr 2026 18:05:11 -0700 Subject: [PATCH 1/8] queue: Add RetryableService#onRetriesExhausted interface. See killbill/killbill#2208 --- .../org/killbill/queue/retry/RetryableService.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/queue/src/main/java/org/killbill/queue/retry/RetryableService.java b/queue/src/main/java/org/killbill/queue/retry/RetryableService.java index 501ca322..0c97da7b 100644 --- a/queue/src/main/java/org/killbill/queue/retry/RetryableService.java +++ b/queue/src/main/java/org/killbill/queue/retry/RetryableService.java @@ -138,6 +138,7 @@ public void scheduleRetry(final QueueRetryException exception, final DateTime effectiveDate = computeRetryDate(exception, originalEffectiveDate, retryNb); if (effectiveDate == null) { log.warn("Error processing event, NOT scheduling retry for event='{}', retryNb='{}'", originalNotificationEvent, retryNb, exception); + onRetriesExhausted(originalNotificationEvent, searchKey1, searchKey2); throw new RetryableInternalException(false); } log.warn("Error processing event, scheduling retry for event='{}', effectiveDate='{}', retryNb='{}'", originalNotificationEvent, effectiveDate, retryNb, exception); @@ -148,10 +149,20 @@ public void scheduleRetry(final QueueRetryException exception, throw new RetryableInternalException(true); } catch (final IOException e) { log.error("Unable to schedule retry for event='{}', effectiveDate='{}'", originalNotificationEvent, effectiveDate, e); + onRetriesExhausted(originalNotificationEvent, searchKey1, searchKey2); throw new RetryableInternalException(false); } } + /** + * Called when the retry schedule is exhausted for an event, or when a retry cannot be scheduled + * due to a serialization error. Subclasses can override to take remedial action (e.g. parking + * the account). searchKey1 = accountRecordId, searchKey2 = tenantRecordId. + */ + protected void onRetriesExhausted(final QueueEvent event, final Long searchKey1, final Long searchKey2) { + // no-op by default + } + private DateTime computeRetryDate(final QueueRetryException queueRetryException, final DateTime initialEventDateTime, final int retryNb) { final List retrySchedule = queueRetryException.getRetrySchedule(); if (retrySchedule == null || retryNb > retrySchedule.size()) { From 099d0e99123cc2a7e136aa8bb2fae87941381202 Mon Sep 17 00:00:00 2001 From: stephane brossier Date: Tue, 28 Apr 2026 18:41:48 -0700 Subject: [PATCH 2/8] pom.xml ordering --- config-magic/pom.xml | 2 +- metrics-api/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config-magic/pom.xml b/config-magic/pom.xml index 6fba4b7d..1eb3da05 100644 --- a/config-magic/pom.xml +++ b/config-magic/pom.xml @@ -66,7 +66,7 @@ maven-surefire-plugin - + diff --git a/metrics-api/pom.xml b/metrics-api/pom.xml index a8a69b8b..a3c5b40b 100644 --- a/metrics-api/pom.xml +++ b/metrics-api/pom.xml @@ -27,5 +27,5 @@ spotbugs-exclude.xml - + From d6fbfe50347c2114b0ceaf3fb469b211dcbe1af3 Mon Sep 17 00:00:00 2001 From: Kill Bill core team Date: Wed, 29 Apr 2026 01:48:20 +0000 Subject: [PATCH 3/8] [maven-release-plugin] prepare release killbill-commons-0.26.14 --- automaton/pom.xml | 2 +- clock/pom.xml | 2 +- concurrent/pom.xml | 2 +- config-magic/pom.xml | 2 +- embeddeddb/common/pom.xml | 2 +- embeddeddb/h2/pom.xml | 2 +- embeddeddb/mysql/pom.xml | 2 +- embeddeddb/pom.xml | 2 +- embeddeddb/postgresql/pom.xml | 2 +- jdbi/pom.xml | 2 +- locker/pom.xml | 2 +- metrics-api/pom.xml | 2 +- metrics/pom.xml | 2 +- pom.xml | 4 ++-- queue/pom.xml | 2 +- skeleton/pom.xml | 2 +- utils/pom.xml | 2 +- xmlloader/pom.xml | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/automaton/pom.xml b/automaton/pom.xml index 025005ce..81044dc6 100644 --- a/automaton/pom.xml +++ b/automaton/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14-SNAPSHOT + 0.26.14 ../pom.xml killbill-automaton diff --git a/clock/pom.xml b/clock/pom.xml index e34c1d11..af0bfd17 100644 --- a/clock/pom.xml +++ b/clock/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14-SNAPSHOT + 0.26.14 ../pom.xml killbill-clock diff --git a/concurrent/pom.xml b/concurrent/pom.xml index 489f652d..202699a4 100644 --- a/concurrent/pom.xml +++ b/concurrent/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14-SNAPSHOT + 0.26.14 ../pom.xml killbill-concurrent diff --git a/config-magic/pom.xml b/config-magic/pom.xml index 1eb3da05..44bf052c 100644 --- a/config-magic/pom.xml +++ b/config-magic/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.14-SNAPSHOT + 0.26.14 ../pom.xml killbill-config-magic diff --git a/embeddeddb/common/pom.xml b/embeddeddb/common/pom.xml index 64468619..3ee511f4 100644 --- a/embeddeddb/common/pom.xml +++ b/embeddeddb/common/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.14-SNAPSHOT + 0.26.14 ../pom.xml killbill-embeddeddb-common diff --git a/embeddeddb/h2/pom.xml b/embeddeddb/h2/pom.xml index c12c436a..e99c574f 100644 --- a/embeddeddb/h2/pom.xml +++ b/embeddeddb/h2/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.14-SNAPSHOT + 0.26.14 ../pom.xml killbill-embeddeddb-h2 diff --git a/embeddeddb/mysql/pom.xml b/embeddeddb/mysql/pom.xml index 655f45c7..1eb03ee5 100644 --- a/embeddeddb/mysql/pom.xml +++ b/embeddeddb/mysql/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.14-SNAPSHOT + 0.26.14 ../pom.xml killbill-embeddeddb-mysql diff --git a/embeddeddb/pom.xml b/embeddeddb/pom.xml index 4f62d992..e44f64a0 100644 --- a/embeddeddb/pom.xml +++ b/embeddeddb/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14-SNAPSHOT + 0.26.14 ../pom.xml killbill-embeddeddb diff --git a/embeddeddb/postgresql/pom.xml b/embeddeddb/postgresql/pom.xml index 187fbfb9..1e7fd0fb 100644 --- a/embeddeddb/postgresql/pom.xml +++ b/embeddeddb/postgresql/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.14-SNAPSHOT + 0.26.14 ../pom.xml killbill-embeddeddb-postgresql diff --git a/jdbi/pom.xml b/jdbi/pom.xml index 5ee2ee23..675528e3 100644 --- a/jdbi/pom.xml +++ b/jdbi/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14-SNAPSHOT + 0.26.14 ../pom.xml killbill-jdbi diff --git a/locker/pom.xml b/locker/pom.xml index 5de01d4b..19d379bd 100644 --- a/locker/pom.xml +++ b/locker/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14-SNAPSHOT + 0.26.14 ../pom.xml killbill-locker diff --git a/metrics-api/pom.xml b/metrics-api/pom.xml index a3c5b40b..16abe3e3 100644 --- a/metrics-api/pom.xml +++ b/metrics-api/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.14-SNAPSHOT + 0.26.14 killbill-metrics-api KillBill Metrics API diff --git a/metrics/pom.xml b/metrics/pom.xml index a5137a76..13372864 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.14-SNAPSHOT + 0.26.14 killbill-metrics KillBill Metrics diff --git a/pom.xml b/pom.xml index 703511eb..df3e8c66 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.kill-bill.commons killbill-commons - 0.26.14-SNAPSHOT + 0.26.14 pom killbill-commons Kill Bill reusable Java components @@ -56,7 +56,7 @@ scm:git:git://github.com/killbill/killbill-commons.git scm:git:git@github.com:killbill/killbill-commons.git - HEAD + killbill-commons-0.26.14 http://github.com/killbill/killbill-commons/tree/master diff --git a/queue/pom.xml b/queue/pom.xml index 3082fd14..2b4517ac 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14-SNAPSHOT + 0.26.14 ../pom.xml killbill-queue diff --git a/skeleton/pom.xml b/skeleton/pom.xml index 7d6c6562..5e3ea1bc 100644 --- a/skeleton/pom.xml +++ b/skeleton/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14-SNAPSHOT + 0.26.14 ../pom.xml killbill-skeleton diff --git a/utils/pom.xml b/utils/pom.xml index 12ef31c0..6359245f 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.14-SNAPSHOT + 0.26.14 ../pom.xml diff --git a/xmlloader/pom.xml b/xmlloader/pom.xml index 6ad488e1..35206de4 100644 --- a/xmlloader/pom.xml +++ b/xmlloader/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14-SNAPSHOT + 0.26.14 ../pom.xml killbill-xmlloader From 3b8ea2f430d5bd1d5438e46e8617772992e55678 Mon Sep 17 00:00:00 2001 From: Kill Bill core team Date: Wed, 29 Apr 2026 01:48:22 +0000 Subject: [PATCH 4/8] [maven-release-plugin] prepare for next development iteration --- automaton/pom.xml | 2 +- clock/pom.xml | 2 +- concurrent/pom.xml | 2 +- config-magic/pom.xml | 4 ++-- embeddeddb/common/pom.xml | 2 +- embeddeddb/h2/pom.xml | 2 +- embeddeddb/mysql/pom.xml | 2 +- embeddeddb/pom.xml | 2 +- embeddeddb/postgresql/pom.xml | 2 +- jdbi/pom.xml | 2 +- locker/pom.xml | 2 +- metrics-api/pom.xml | 4 ++-- metrics/pom.xml | 2 +- pom.xml | 4 ++-- queue/pom.xml | 2 +- skeleton/pom.xml | 2 +- utils/pom.xml | 2 +- xmlloader/pom.xml | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/automaton/pom.xml b/automaton/pom.xml index 81044dc6..9419fe32 100644 --- a/automaton/pom.xml +++ b/automaton/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14 + 0.26.15-SNAPSHOT ../pom.xml killbill-automaton diff --git a/clock/pom.xml b/clock/pom.xml index af0bfd17..64c07a21 100644 --- a/clock/pom.xml +++ b/clock/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14 + 0.26.15-SNAPSHOT ../pom.xml killbill-clock diff --git a/concurrent/pom.xml b/concurrent/pom.xml index 202699a4..ea5cab3c 100644 --- a/concurrent/pom.xml +++ b/concurrent/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14 + 0.26.15-SNAPSHOT ../pom.xml killbill-concurrent diff --git a/config-magic/pom.xml b/config-magic/pom.xml index 44bf052c..69206da5 100644 --- a/config-magic/pom.xml +++ b/config-magic/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.14 + 0.26.15-SNAPSHOT ../pom.xml killbill-config-magic @@ -66,7 +66,7 @@ maven-surefire-plugin - + diff --git a/embeddeddb/common/pom.xml b/embeddeddb/common/pom.xml index 3ee511f4..39a2c928 100644 --- a/embeddeddb/common/pom.xml +++ b/embeddeddb/common/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.14 + 0.26.15-SNAPSHOT ../pom.xml killbill-embeddeddb-common diff --git a/embeddeddb/h2/pom.xml b/embeddeddb/h2/pom.xml index e99c574f..13e21e8d 100644 --- a/embeddeddb/h2/pom.xml +++ b/embeddeddb/h2/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.14 + 0.26.15-SNAPSHOT ../pom.xml killbill-embeddeddb-h2 diff --git a/embeddeddb/mysql/pom.xml b/embeddeddb/mysql/pom.xml index 1eb03ee5..45cfaa29 100644 --- a/embeddeddb/mysql/pom.xml +++ b/embeddeddb/mysql/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.14 + 0.26.15-SNAPSHOT ../pom.xml killbill-embeddeddb-mysql diff --git a/embeddeddb/pom.xml b/embeddeddb/pom.xml index e44f64a0..f771b07c 100644 --- a/embeddeddb/pom.xml +++ b/embeddeddb/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14 + 0.26.15-SNAPSHOT ../pom.xml killbill-embeddeddb diff --git a/embeddeddb/postgresql/pom.xml b/embeddeddb/postgresql/pom.xml index 1e7fd0fb..b0445fbc 100644 --- a/embeddeddb/postgresql/pom.xml +++ b/embeddeddb/postgresql/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.14 + 0.26.15-SNAPSHOT ../pom.xml killbill-embeddeddb-postgresql diff --git a/jdbi/pom.xml b/jdbi/pom.xml index 675528e3..17a91149 100644 --- a/jdbi/pom.xml +++ b/jdbi/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14 + 0.26.15-SNAPSHOT ../pom.xml killbill-jdbi diff --git a/locker/pom.xml b/locker/pom.xml index 19d379bd..daaba410 100644 --- a/locker/pom.xml +++ b/locker/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14 + 0.26.15-SNAPSHOT ../pom.xml killbill-locker diff --git a/metrics-api/pom.xml b/metrics-api/pom.xml index 16abe3e3..e32bd65d 100644 --- a/metrics-api/pom.xml +++ b/metrics-api/pom.xml @@ -20,12 +20,12 @@ org.kill-bill.commons killbill-commons - 0.26.14 + 0.26.15-SNAPSHOT killbill-metrics-api KillBill Metrics API spotbugs-exclude.xml - + diff --git a/metrics/pom.xml b/metrics/pom.xml index 13372864..2e6028fb 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.14 + 0.26.15-SNAPSHOT killbill-metrics KillBill Metrics diff --git a/pom.xml b/pom.xml index df3e8c66..c50614d9 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.kill-bill.commons killbill-commons - 0.26.14 + 0.26.15-SNAPSHOT pom killbill-commons Kill Bill reusable Java components @@ -56,7 +56,7 @@ scm:git:git://github.com/killbill/killbill-commons.git scm:git:git@github.com:killbill/killbill-commons.git - killbill-commons-0.26.14 + HEAD http://github.com/killbill/killbill-commons/tree/master diff --git a/queue/pom.xml b/queue/pom.xml index 2b4517ac..adb01bfe 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14 + 0.26.15-SNAPSHOT ../pom.xml killbill-queue diff --git a/skeleton/pom.xml b/skeleton/pom.xml index 5e3ea1bc..ffb04a9b 100644 --- a/skeleton/pom.xml +++ b/skeleton/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14 + 0.26.15-SNAPSHOT ../pom.xml killbill-skeleton diff --git a/utils/pom.xml b/utils/pom.xml index 6359245f..11477d4e 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.14 + 0.26.15-SNAPSHOT ../pom.xml diff --git a/xmlloader/pom.xml b/xmlloader/pom.xml index 35206de4..b2fe1705 100644 --- a/xmlloader/pom.xml +++ b/xmlloader/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.14 + 0.26.15-SNAPSHOT ../pom.xml killbill-xmlloader From d5c4e52abaf5e05b84ad6d1903d2a2521b986b4c Mon Sep 17 00:00:00 2001 From: stephane brossier Date: Tue, 28 Apr 2026 20:11:37 -0700 Subject: [PATCH 5/8] pom.xml --- config-magic/pom.xml | 2 +- metrics-api/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config-magic/pom.xml b/config-magic/pom.xml index 69206da5..8e999e3a 100644 --- a/config-magic/pom.xml +++ b/config-magic/pom.xml @@ -66,7 +66,7 @@ maven-surefire-plugin - + diff --git a/metrics-api/pom.xml b/metrics-api/pom.xml index e32bd65d..17ba6e83 100644 --- a/metrics-api/pom.xml +++ b/metrics-api/pom.xml @@ -27,5 +27,5 @@ spotbugs-exclude.xml - + From fbd602c19f662be6a6b7e524c4cba059ab8bff33 Mon Sep 17 00:00:00 2001 From: Kill Bill core team Date: Wed, 29 Apr 2026 04:46:17 +0000 Subject: [PATCH 6/8] [maven-release-plugin] prepare release killbill-commons-0.26.15 --- automaton/pom.xml | 2 +- clock/pom.xml | 2 +- concurrent/pom.xml | 2 +- config-magic/pom.xml | 2 +- embeddeddb/common/pom.xml | 2 +- embeddeddb/h2/pom.xml | 2 +- embeddeddb/mysql/pom.xml | 2 +- embeddeddb/pom.xml | 2 +- embeddeddb/postgresql/pom.xml | 2 +- jdbi/pom.xml | 2 +- locker/pom.xml | 2 +- metrics-api/pom.xml | 2 +- metrics/pom.xml | 2 +- pom.xml | 4 ++-- queue/pom.xml | 2 +- skeleton/pom.xml | 2 +- utils/pom.xml | 2 +- xmlloader/pom.xml | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/automaton/pom.xml b/automaton/pom.xml index 9419fe32..e783d6cd 100644 --- a/automaton/pom.xml +++ b/automaton/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15-SNAPSHOT + 0.26.15 ../pom.xml killbill-automaton diff --git a/clock/pom.xml b/clock/pom.xml index 64c07a21..67affb40 100644 --- a/clock/pom.xml +++ b/clock/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15-SNAPSHOT + 0.26.15 ../pom.xml killbill-clock diff --git a/concurrent/pom.xml b/concurrent/pom.xml index ea5cab3c..a72ca3b5 100644 --- a/concurrent/pom.xml +++ b/concurrent/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15-SNAPSHOT + 0.26.15 ../pom.xml killbill-concurrent diff --git a/config-magic/pom.xml b/config-magic/pom.xml index 8e999e3a..b6733f3e 100644 --- a/config-magic/pom.xml +++ b/config-magic/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.15-SNAPSHOT + 0.26.15 ../pom.xml killbill-config-magic diff --git a/embeddeddb/common/pom.xml b/embeddeddb/common/pom.xml index 39a2c928..9cb6943c 100644 --- a/embeddeddb/common/pom.xml +++ b/embeddeddb/common/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.15-SNAPSHOT + 0.26.15 ../pom.xml killbill-embeddeddb-common diff --git a/embeddeddb/h2/pom.xml b/embeddeddb/h2/pom.xml index 13e21e8d..631d18d9 100644 --- a/embeddeddb/h2/pom.xml +++ b/embeddeddb/h2/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.15-SNAPSHOT + 0.26.15 ../pom.xml killbill-embeddeddb-h2 diff --git a/embeddeddb/mysql/pom.xml b/embeddeddb/mysql/pom.xml index 45cfaa29..4c34f168 100644 --- a/embeddeddb/mysql/pom.xml +++ b/embeddeddb/mysql/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.15-SNAPSHOT + 0.26.15 ../pom.xml killbill-embeddeddb-mysql diff --git a/embeddeddb/pom.xml b/embeddeddb/pom.xml index f771b07c..2d67ce84 100644 --- a/embeddeddb/pom.xml +++ b/embeddeddb/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15-SNAPSHOT + 0.26.15 ../pom.xml killbill-embeddeddb diff --git a/embeddeddb/postgresql/pom.xml b/embeddeddb/postgresql/pom.xml index b0445fbc..e77e520d 100644 --- a/embeddeddb/postgresql/pom.xml +++ b/embeddeddb/postgresql/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.15-SNAPSHOT + 0.26.15 ../pom.xml killbill-embeddeddb-postgresql diff --git a/jdbi/pom.xml b/jdbi/pom.xml index 17a91149..16918ba1 100644 --- a/jdbi/pom.xml +++ b/jdbi/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15-SNAPSHOT + 0.26.15 ../pom.xml killbill-jdbi diff --git a/locker/pom.xml b/locker/pom.xml index daaba410..648e1adf 100644 --- a/locker/pom.xml +++ b/locker/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15-SNAPSHOT + 0.26.15 ../pom.xml killbill-locker diff --git a/metrics-api/pom.xml b/metrics-api/pom.xml index 17ba6e83..84332baf 100644 --- a/metrics-api/pom.xml +++ b/metrics-api/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.15-SNAPSHOT + 0.26.15 killbill-metrics-api KillBill Metrics API diff --git a/metrics/pom.xml b/metrics/pom.xml index 2e6028fb..ca6cd870 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.15-SNAPSHOT + 0.26.15 killbill-metrics KillBill Metrics diff --git a/pom.xml b/pom.xml index c50614d9..9f2bcb1c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.kill-bill.commons killbill-commons - 0.26.15-SNAPSHOT + 0.26.15 pom killbill-commons Kill Bill reusable Java components @@ -56,7 +56,7 @@ scm:git:git://github.com/killbill/killbill-commons.git scm:git:git@github.com:killbill/killbill-commons.git - HEAD + killbill-commons-0.26.15 http://github.com/killbill/killbill-commons/tree/master diff --git a/queue/pom.xml b/queue/pom.xml index adb01bfe..1c7b5b4c 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15-SNAPSHOT + 0.26.15 ../pom.xml killbill-queue diff --git a/skeleton/pom.xml b/skeleton/pom.xml index ffb04a9b..0c896de3 100644 --- a/skeleton/pom.xml +++ b/skeleton/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15-SNAPSHOT + 0.26.15 ../pom.xml killbill-skeleton diff --git a/utils/pom.xml b/utils/pom.xml index 11477d4e..ff434ab8 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.15-SNAPSHOT + 0.26.15 ../pom.xml diff --git a/xmlloader/pom.xml b/xmlloader/pom.xml index b2fe1705..982d9c66 100644 --- a/xmlloader/pom.xml +++ b/xmlloader/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15-SNAPSHOT + 0.26.15 ../pom.xml killbill-xmlloader From a79360c69357e8cfa02e2ec9f0f0591b06303529 Mon Sep 17 00:00:00 2001 From: Kill Bill core team Date: Wed, 29 Apr 2026 04:46:19 +0000 Subject: [PATCH 7/8] [maven-release-plugin] prepare for next development iteration --- automaton/pom.xml | 2 +- clock/pom.xml | 2 +- concurrent/pom.xml | 2 +- config-magic/pom.xml | 4 ++-- embeddeddb/common/pom.xml | 2 +- embeddeddb/h2/pom.xml | 2 +- embeddeddb/mysql/pom.xml | 2 +- embeddeddb/pom.xml | 2 +- embeddeddb/postgresql/pom.xml | 2 +- jdbi/pom.xml | 2 +- locker/pom.xml | 2 +- metrics-api/pom.xml | 4 ++-- metrics/pom.xml | 2 +- pom.xml | 4 ++-- queue/pom.xml | 2 +- skeleton/pom.xml | 2 +- utils/pom.xml | 2 +- xmlloader/pom.xml | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/automaton/pom.xml b/automaton/pom.xml index e783d6cd..90841b7e 100644 --- a/automaton/pom.xml +++ b/automaton/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15 + 0.26.16-SNAPSHOT ../pom.xml killbill-automaton diff --git a/clock/pom.xml b/clock/pom.xml index 67affb40..1b76faae 100644 --- a/clock/pom.xml +++ b/clock/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15 + 0.26.16-SNAPSHOT ../pom.xml killbill-clock diff --git a/concurrent/pom.xml b/concurrent/pom.xml index a72ca3b5..4f1f4da2 100644 --- a/concurrent/pom.xml +++ b/concurrent/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15 + 0.26.16-SNAPSHOT ../pom.xml killbill-concurrent diff --git a/config-magic/pom.xml b/config-magic/pom.xml index b6733f3e..8c9a3b6a 100644 --- a/config-magic/pom.xml +++ b/config-magic/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.15 + 0.26.16-SNAPSHOT ../pom.xml killbill-config-magic @@ -66,7 +66,7 @@ maven-surefire-plugin - + diff --git a/embeddeddb/common/pom.xml b/embeddeddb/common/pom.xml index 9cb6943c..0cbc383e 100644 --- a/embeddeddb/common/pom.xml +++ b/embeddeddb/common/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.15 + 0.26.16-SNAPSHOT ../pom.xml killbill-embeddeddb-common diff --git a/embeddeddb/h2/pom.xml b/embeddeddb/h2/pom.xml index 631d18d9..1c9b3a7c 100644 --- a/embeddeddb/h2/pom.xml +++ b/embeddeddb/h2/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.15 + 0.26.16-SNAPSHOT ../pom.xml killbill-embeddeddb-h2 diff --git a/embeddeddb/mysql/pom.xml b/embeddeddb/mysql/pom.xml index 4c34f168..fc0d677e 100644 --- a/embeddeddb/mysql/pom.xml +++ b/embeddeddb/mysql/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.15 + 0.26.16-SNAPSHOT ../pom.xml killbill-embeddeddb-mysql diff --git a/embeddeddb/pom.xml b/embeddeddb/pom.xml index 2d67ce84..60364030 100644 --- a/embeddeddb/pom.xml +++ b/embeddeddb/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15 + 0.26.16-SNAPSHOT ../pom.xml killbill-embeddeddb diff --git a/embeddeddb/postgresql/pom.xml b/embeddeddb/postgresql/pom.xml index e77e520d..b9847513 100644 --- a/embeddeddb/postgresql/pom.xml +++ b/embeddeddb/postgresql/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-embeddeddb - 0.26.15 + 0.26.16-SNAPSHOT ../pom.xml killbill-embeddeddb-postgresql diff --git a/jdbi/pom.xml b/jdbi/pom.xml index 16918ba1..32cc5abc 100644 --- a/jdbi/pom.xml +++ b/jdbi/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15 + 0.26.16-SNAPSHOT ../pom.xml killbill-jdbi diff --git a/locker/pom.xml b/locker/pom.xml index 648e1adf..c167de9a 100644 --- a/locker/pom.xml +++ b/locker/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15 + 0.26.16-SNAPSHOT ../pom.xml killbill-locker diff --git a/metrics-api/pom.xml b/metrics-api/pom.xml index 84332baf..6b0643ca 100644 --- a/metrics-api/pom.xml +++ b/metrics-api/pom.xml @@ -20,12 +20,12 @@ org.kill-bill.commons killbill-commons - 0.26.15 + 0.26.16-SNAPSHOT killbill-metrics-api KillBill Metrics API spotbugs-exclude.xml - + diff --git a/metrics/pom.xml b/metrics/pom.xml index ca6cd870..38a8a6e6 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.15 + 0.26.16-SNAPSHOT killbill-metrics KillBill Metrics diff --git a/pom.xml b/pom.xml index 9f2bcb1c..160c90ba 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.kill-bill.commons killbill-commons - 0.26.15 + 0.26.16-SNAPSHOT pom killbill-commons Kill Bill reusable Java components @@ -56,7 +56,7 @@ scm:git:git://github.com/killbill/killbill-commons.git scm:git:git@github.com:killbill/killbill-commons.git - killbill-commons-0.26.15 + HEAD http://github.com/killbill/killbill-commons/tree/master diff --git a/queue/pom.xml b/queue/pom.xml index 1c7b5b4c..6a241fb0 100644 --- a/queue/pom.xml +++ b/queue/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15 + 0.26.16-SNAPSHOT ../pom.xml killbill-queue diff --git a/skeleton/pom.xml b/skeleton/pom.xml index 0c896de3..9f769f45 100644 --- a/skeleton/pom.xml +++ b/skeleton/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15 + 0.26.16-SNAPSHOT ../pom.xml killbill-skeleton diff --git a/utils/pom.xml b/utils/pom.xml index ff434ab8..c057ec23 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -20,7 +20,7 @@ org.kill-bill.commons killbill-commons - 0.26.15 + 0.26.16-SNAPSHOT ../pom.xml diff --git a/xmlloader/pom.xml b/xmlloader/pom.xml index 982d9c66..59948f41 100644 --- a/xmlloader/pom.xml +++ b/xmlloader/pom.xml @@ -22,7 +22,7 @@ org.kill-bill.commons killbill-commons - 0.26.15 + 0.26.16-SNAPSHOT ../pom.xml killbill-xmlloader From 5d6f1bed8f1dc631bda5c6f407af2aa691066b25 Mon Sep 17 00:00:00 2001 From: xsalefter Date: Thu, 7 May 2026 00:04:50 +0700 Subject: [PATCH 8/8] fix broken test because 15s wait is not enough The error message: Condition returned by method "waitFor" in class org.killbill.queue.TestReaperIntegration$DummyHandler was not fulfilled within 15 seconds. --- .../src/test/java/org/killbill/queue/TestReaperIntegration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/queue/src/test/java/org/killbill/queue/TestReaperIntegration.java b/queue/src/test/java/org/killbill/queue/TestReaperIntegration.java index 879bfa7b..cff647a1 100644 --- a/queue/src/test/java/org/killbill/queue/TestReaperIntegration.java +++ b/queue/src/test/java/org/killbill/queue/TestReaperIntegration.java @@ -339,7 +339,7 @@ public void processEvent(final BusEvent event) { } void waitFor(final BusEvent event) { - Awaitility.await().atMost(15, TimeUnit.SECONDS).until(new Callable() { + Awaitility.await().atMost(30, TimeUnit.SECONDS).until(new Callable() { @Override public Boolean call() throws Exception { return receivedEvents.contains(event.getUserToken());