killbill-aplcache

Merge remote-tracking branch 'origin/master' into usage Conflicts: pom.xml

Usage in arrear: - Enhance beatrix test TestConsumableInArrear - …

Code review integration
- Fix additional isaues found while testing

server: update default properties 33d394a765e653337596a0af383888d229c0f5cc …

broke them.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

osgi-bundles: fix killbill osgi lib build Signed-off-by: …

Pierre-Alexandre Meyer <pierre@mouraf.org>

osgi: use same jdbc defaults as the main connection pool Signed-off-by: …

Pierre-Alexandre Meyer <pierre@mouraf.org>

osgi: fix dependencies We were importing both OSGI interfaces …

relocated by Felix and the ones
provided by the org.osgi groupId.

This was causing conflicts at runtime on certain deployments. We now only
use the Felix ones.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

Merge remote-tracking branch 'remotes/origin/usage' into …

usage

Initial usage consumable in arrear beatrix test Fix two issues …

in the code
Fix copyright Inc. -> LLC

Add unit tests for SubscriptionConsumableInArrear class …

(and fix a few bugs)

Bug fixes and unit tests for implementation of in arrear/conusmable …

usage invoice.