killbill-aplcache

diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPublicBus.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPublicBus.java
index 6fcf0e5..2c9aa27 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPublicBus.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPublicBus.java
@@ -111,6 +111,10 @@ public class TestPublicBus extends TestIntegrationBase {
 
     @AfterMethod(groups = "slow")
     public void afterMethod() throws Exception {
+        if (hasFailed()) {
+            return;
+        }
+
         externalBus.unregister(publicListener);
         super.afterMethod();
     }
@@ -184,7 +188,7 @@ public class TestPublicBus extends TestIntegrationBase {
                 event.getEventType() == ExtBusEventType.SUBSCRIPTION_UNCANCEL ||
                 event.getEventType() == ExtBusEventType.SUBSCRIPTION_BCD_CHANGE) {
                 try {
-                    final SubscriptionMetadata obj = (SubscriptionMetadata) mapper.readValue(event.getMetaData(), SubscriptionMetadata.class);
+                    final SubscriptionMetadata obj = mapper.readValue(event.getMetaData(), SubscriptionMetadata.class);
                     Assert.assertNotNull(obj.getBundleExternalKey());
                     Assert.assertNotNull(obj.getActionType());
                 } catch (final JsonParseException e) {

diff --git a/pom.xml b/pom.xml
index cdf7211..abc03d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>killbill-oss-parent</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.141.68-SNAPSHOT</version>
+        <version>0.141.68</version>
     </parent>
     <artifactId>killbill</artifactId>
     <version>0.19.16-SNAPSHOT</version>

diff --git a/util/src/test/java/org/killbill/billing/api/TestApiListener.java b/util/src/test/java/org/killbill/billing/api/TestApiListener.java
index 83cb4c2..b431636 100644
--- a/util/src/test/java/org/killbill/billing/api/TestApiListener.java
+++ b/util/src/test/java/org/killbill/billing/api/TestApiListener.java
@@ -324,8 +324,12 @@ public class TestApiListener {
                 } catch (final Exception ignore) {
                     // Rerun one more time to provide details
                     final long pending = idbi.withHandle(new PendingBusOrNotificationCallback(clock));
-                    log.error("isCompleted : Received all events but found remaining unprocessed bus events/notifications =  {}", pending);
-                    return false;
+                    if (pending != 0) {
+                        log.error("isCompleted : Received all events but found remaining unprocessed bus events/notifications = {}", pending);
+                        return false;
+                    } else {
+                        return completed;
+                    }
                 }
             } while (waitTimeMs > 0 && !completed);
         }