Create new entitlement module and move blocking API from junction into that new module
Rename JunctionApi -> EntitlementApi
JunctionApi -> EntitlementApi
.idea: import shared settings

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Merge branch 'master' of github.com:killbill/killbill
beatrix: fix tests issues

* Make sure that all bus handlers are done before continuing tests
* Add missing expected events

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Fix plugin test after API change (OSGI import/export)
Merge remote-tracking branch 'origin/master' into entitlement++

Conflicts:
	beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
Add missing (deleted by git) copyright
beatrix: add missing expected event in TestOverdueWithSubscriptionCancellation

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Merge remote-tracking branch 'origin/master' into entitlement++
Copyright in IntelliJ
entitlement: add missing dependency on com.jayway.awaitility for tests

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Merge remote-tracking branch 'origin/master' into entitlement++

Conflicts:
	entitlement/killbill-entitlement.iml
entitlement: fix for TestApiListener when using an in-memory bus

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

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
entitlement: fix expected events in TestTransfer

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Fix flaky tests
Increment oss parent to have latest killbill-api for subscription -> entitlement work
Merge branch 'entitlement++'

Conflicts:
	entitlement/killbill-entitlement.iml
	entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteNoDB.java
	subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiAddOn.java