killbill-memoizeit

diff --git a/beatrix/src/main/java/org/killbill/billing/beatrix/glue/ExternalPersistentBusConfig.java b/beatrix/src/main/java/org/killbill/billing/beatrix/glue/ExternalPersistentBusConfig.java
index 77d8fc0..a1bc7b5 100644
--- a/beatrix/src/main/java/org/killbill/billing/beatrix/glue/ExternalPersistentBusConfig.java
+++ b/beatrix/src/main/java/org/killbill/billing/beatrix/glue/ExternalPersistentBusConfig.java
@@ -16,14 +16,13 @@
 
 package org.killbill.billing.beatrix.glue;
 
+import org.killbill.bus.api.PersistentBusConfig;
 import org.skife.config.ConfigSource;
 import org.skife.config.ConfigurationObjectFactory;
 import org.skife.config.TimeSpan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.killbill.bus.api.PersistentBusConfig;
-
 import com.google.common.collect.ImmutableMap;
 
 // Hack to make sure the external and internal buses don't share the same tables names.
@@ -90,8 +89,8 @@ public class ExternalPersistentBusConfig extends PersistentBusConfig {
     }
 
     @Override
-    public int getPrefetchEntries() {
-        return externalPersistentBusConfig.getPrefetchEntries();
+    public boolean isSticky() {
+        return externalPersistentBusConfig.isSticky();
     }
 
     @Override

diff --git a/osgi-bundles/bundles/jruby/pom.xml b/osgi-bundles/bundles/jruby/pom.xml
index 7c6b369..c92a789 100644
--- a/osgi-bundles/bundles/jruby/pom.xml
+++ b/osgi-bundles/bundles/jruby/pom.xml
@@ -158,7 +158,6 @@
                             org.killbill.billing.subscription.api.user;
                             org.killbill.billing.junction.api;
                             org.killbill.billing;
-                            org.killbill.billing.osgi.api;
                             org.killbill.billing.overdue;
                             org.killbill.billing.tenant.api;
                             org.killbill.billing.usage.api;

diff --git a/osgi-bundles/defaultbundles/pom.xml b/osgi-bundles/defaultbundles/pom.xml
index 8e12581..89a26de 100644
--- a/osgi-bundles/defaultbundles/pom.xml
+++ b/osgi-bundles/defaultbundles/pom.xml
@@ -93,6 +93,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.webconsole</artifactId>
+            <classifier>all</classifier>
         </dependency>
         <dependency>
             <groupId>org.kill-bill.billing</groupId>

diff --git a/pom.xml b/pom.xml
index 72073ba..25bfa24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill-oss-parent</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.5.30</version>
+        <version>0.5.32</version>
     </parent>
     <artifactId>killbill</artifactId>
     <version>0.10.1-SNAPSHOT</version>

diff --git a/util/src/main/java/org/killbill/billing/util/config/OSGIConfig.java b/util/src/main/java/org/killbill/billing/util/config/OSGIConfig.java
index 0107e83..2698c87 100644
--- a/util/src/main/java/org/killbill/billing/util/config/OSGIConfig.java
+++ b/util/src/main/java/org/killbill/billing/util/config/OSGIConfig.java
@@ -87,7 +87,7 @@ public interface OSGIConfig extends KillbillConfig {
 
              "org.osgi.service.log;version=1.3," +
              // Let the world know the System bundle exposes (via org.osgi.compendium) the requirement (osgi.wiring.package=org.osgi.service.http)
-             "org.osgi.service.http," +
+             "org.osgi.service.http;version=1.2.0," +
              // Let the world know the System bundle exposes (via org.osgi.compendium) the requirement (&(osgi.wiring.package=org.osgi.service.deploymentadmin)(version>=1.1.0)(!(version>=2.0.0)))
              "org.osgi.service.deploymentadmin;version=1.1.0," +
              // Let the world know the System bundle exposes (via org.osgi.compendium) the requirement (&(osgi.wiring.package=org.osgi.service.event)(version>=1.2.0)(!(version>=2.0.0)))