diff --git a/java-persistence-api-1.1.1/pom.xml b/java-persistence-api-1.1.1/pom.xml
index 244ea2b..045bc67 100644
--- a/java-persistence-api-1.1.1/pom.xml
+++ b/java-persistence-api-1.1.1/pom.xml
@@ -55,7 +55,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.persistence*;version=1.1.1;-split-package:=merge-first</Export-Package>
-                        <Import-Package>*</Import-Package>
+                        <Import-Package>!javax.persistence*,*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
                         <Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
                         <Implementation-Title>Apache ServiceMix</Implementation-Title>
diff --git a/java-persistence-api-2.0/pom.xml b/java-persistence-api-2.0/pom.xml
index 2f1a905..aed0cbf 100644
--- a/java-persistence-api-2.0/pom.xml
+++ b/java-persistence-api-2.0/pom.xml
@@ -55,7 +55,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.persistence*;version=2.0;-split-package:=merge-first</Export-Package>
-                        <Import-Package>*</Import-Package>
+                        <Import-Package>!javax.persistence*,*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
                         <Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
                         <Implementation-Title>Apache ServiceMix</Implementation-Title>
@@ -173,4 +173,4 @@
         </profile>
     </profiles>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/jaxb-api-2.2/src/main/java/javax/xml/bind/ContextFinder.java b/jaxb-api-2.2/src/main/java/javax/xml/bind/ContextFinder.java
index 938b5aa..24f5abf 100644
--- a/jaxb-api-2.2/src/main/java/javax/xml/bind/ContextFinder.java
+++ b/jaxb-api-2.2/src/main/java/javax/xml/bind/ContextFinder.java
@@ -30,7 +30,7 @@
     private static final String JAXB_CONTEXT_PROPERTY = JAXBContext.class.getName();
     private static final String JAXB_CONTEXT_FACTORY = JAXBContext.JAXB_CONTEXT_FACTORY;
 
-    public static JAXBContext find(String contextPath, ClassLoader classLoader, Map properties) throws JAXBException {
+    public static JAXBContext find(String factoryId, String contextPath, ClassLoader classLoader, Map properties) throws JAXBException {
         String className = null;
         // Patch for bug https://issues.apache.org/activemq/browse/SMX4-329
         if (contextPath == null || contextPath.length() == 0) {