killbill-memoizeit

diff --git a/osgi-bundles/bundles/jruby/pom.xml b/osgi-bundles/bundles/jruby/pom.xml
index 6497030..0fee635 100644
--- a/osgi-bundles/bundles/jruby/pom.xml
+++ b/osgi-bundles/bundles/jruby/pom.xml
@@ -113,42 +113,63 @@
                         <Bundle-Activator>org.killbill.billing.osgi.bundles.jruby.JRubyActivator</Bundle-Activator>
                         <Export-Package></Export-Package>
                         <Private-Package>org.killbill.billing.osgi.bundles.jruby.*</Private-Package>
-                        <!-- Optional resolution because exported by the Felix system bundle -->
+
+                        <!--
+                            Those are the packages generated by the plugin when <Import-Package>*;<Import-Package>
+                            is set to default. In the latest release of felix (0.4.4, the code checks for duplicate packages
+                            and freaks out if it finds any; so we need to be cautious and only add the one missing from the list
+                            generated by *. Somehow lame...)
+                            com.google.common.base;version="[15.0,16)",
+                            javax.servlet ;version="[3.0,4)",
+                            javax.servlet.http;version="[3.0,4)",
+                            org.joda.time;version="[2.3,3)",
+                            org.jruby.embed;version="[1.7,2)",
+                            org.jruby.runtime.builtin;version="[1.7,2)",
+                            org.jruby;version="[1.7,2)",
+                            org.killbill.billing.account.api,
+                            org.killbill.billing.catalog.api,
+                            org.killbill.billing.currency.api,
+                            org.killbill.billing.currency.plugin.api,
+                            org.killbill.billing.entitlement.api,
+                            org.killbill.billing.invoice.api,
+                            org.killbill.billing.notification.plugin.api,
+                            org.killbill.billing.osgi.api.config,
+                            org.killbill.billing.payment.api,
+                            org.killbill.billing.payment.plugin.api,
+                            org.killbill.billing.util.api,
+                            org.killbill.billing.util.callcontext,
+                            org.killbill.billing.util.entity,
+                            org.killbill.commons.concurrent,
+                            org.killbill.killbill.osgi.libs.killbill,
+                            org.osgi.framework;version="[1.5,2)",
+                            org.osgi.service.log;version="[1.3,2)",
+                            org.slf4j;version="[1.7,2)"
+                        -->
+                        <!-- Optional resolution because exported by the Felix system bundle
+                             STEPH: I am actually not sure about that, but that seems to work, so not touching it  -->
                         <Import-Package>*;resolution:=optional,
-                            org.killbill.billing.account.api;
                             org.killbill.billing.analytics.api.sanity;
                             org.killbill.billing.analytics.api.user;
                             org.killbill.billing.beatrix.bus.api;
-                            org.killbill.billing.catalog.api;
                             org.killbill.billing.subscription.api;
                             org.killbill.billing.subscription.api.migration;
                             org.killbill.billing.subscription.api.timeline;
                             org.killbill.billing.subscription.api.transfer;
                             org.killbill.billing.subscription.api.user;
-                            org.killbill.billing.entitlement.api;
-                            org.killbill.billing.invoice.api;
                             org.killbill.billing.junction.api;
                             org.killbill.billing;
                             org.killbill.billing.osgi.api;
-                            org.killbill.billing.osgi.api.config;
                             org.killbill.billing.overdue;
-                            org.killbill.billing.payment.api;
-                            org.killbill.billing.payment.plugin.api;
-                            org.killbill.billing.currency.plugin.api;
                             org.killbill.billing.tenant.api;
                             org.killbill.billing.usage.api;
-                            org.killbill.billing.util.api;
                             org.killbill.billing.util.audit;
-                            org.killbill.billing.util.callcontext;
                             org.killbill.billing.util.customfield;
                             org.killbill.billing.notification.plugin;
-                            org.killbill.billing.currency.api;
                             org.killbill.billing.util.email;
-                            org.killbill.billing.util.entity;
                             org.killbill.billing.util.tag;
                             org.killbill.billing.util.template;
                             org.killbill.billing.util.template.translation;resolution:=optional,
-                            org.joda.time;org.joda.time.format;resolution:=optional,
+                            org.joda.time.format;resolution:=optional,
                             sun.misc;
                             sun.misc.*;
                             sun.misc.unsafe;