diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index 56ba23f2e6..d754e15ba5 100644
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -199,7 +199,6 @@
         <inherited>true</inherited>
         <configuration>
           <instructions>
-            <Export-Package>*</Export-Package>
             <Import-Package>
               !com.google.errorprone.annotations,
               !com.google.errorprone.annotations.concurrent,
diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml
index d685316470..4233842d2f 100644
--- a/activemq-jms-pool/pom.xml
+++ b/activemq-jms-pool/pom.xml
@@ -109,7 +109,7 @@
         <inherited>true</inherited>
         <configuration>
           <instructions>
-            <Export-Package>*</Export-Package>
+            <Export-Package>org.apache.activemq.jms.pool*;version=${project.version};-noimport:=true</Export-Package>
             <Import-Package>
               javax.jms*;version="[1.1,3)",
               javax.transaction*;resolution:=optional,
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index dfdd7cdc94..3552cfd2e0 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -213,7 +213,7 @@
               org.apache.tools.ant*;resolution:=optional,
               org.apache.log4j*;resolution:=optional,
               org.json*;resolution:=optional,
-              org.objectweb.asm;version="[5,8)";resolution:=optional,
+              org.objectweb.asm;version="[5,10)";resolution:=optional,
               mx4j.tools*;resolution:=optional,
               org.slf4j*;resolution:=optional,
               org.osgi.service.blueprint;resolution:=optional,
diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml
index f1512f1809..3fe683ba14 100644
--- a/activemq-pool/pom.xml
+++ b/activemq-pool/pom.xml
@@ -131,7 +131,7 @@
         <inherited>true</inherited>
         <configuration>
           <instructions>
-            <Export-Package>*</Export-Package>
+            <Export-Package>org.apache.activemq.pool*;version=${project.version};-noimport:=true</Export-Package>
             <Import-Package>
               javax.transaction*;resolution:=optional,
               org.apache.activemq.jms.pool*;resolution:=optional,