killbill-developers

Merge branch 'master' into work-for-release-0.17.0 Conflicts: pom.xml

Update oss pom.xml

Merge branch 'master' into test-with-inflightQ

util: Add HikariCP test dependency

beatrix: Harden logic in TestApiListener isCompleted method …

to also look for unprocessed ready notifications

Also refactor code a bit to abstract that piece and also use it in the exception clause.

beatrix: Revert wrong test assertion

beatrix: Fix overdue test issue (flakiness due to non deterministic …

behavior)

tests: refactoring of DBTestingHelper based on the similar …

changes in platform (to allow supporting STICKY_EVENTS queue mode)

Fix missing events after merge (test was created in 0.16.x branch)

Merge remote-tracking branch 'origin/master' into work-for-release-0.17.0 Conflicts: entitlement/src/main/java/org/killbill/billing/entitlement/api/svcs/DefaultEntitlementApiBase.java invoice/src/main/java/org/killbill/billing/invoice/InvoiceDispatcher.java invoice/src/main/java/org/killbill/billing/invoice/InvoiceListener.java invoice/src/main/java/org/killbill/billing/invoice/InvoiceTagHandler.java invoice/src/main/java/org/killbill/billing/invoice/generator/FixedAndRecurringInvoiceItemGenerator.java invoice/src/main/java/org/killbill/billing/invoice/usage/RawUsageOptimizer.java jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/SubscriptionResource.java junction/src/main/java/org/killbill/billing/junction/plumbing/billing/BillCycleDayCalculator.java pom.xml util/src/main/java/org/killbill/billing/util/callcontext/InternalCallContextFactory.java