diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml
index b7bd229b..0bc03f13 100644
--- a/core-tiger/pom.xml
+++ b/core-tiger/pom.xml
@@ -45,26 +45,22 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <excludeDependencies>true</excludeDependencies>
                     <instructions>
                         <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
                         <Export-Package>org.springframework.ws*</Export-Package>
                         <Import-Package>
                             org.apache.commons.logging*,
                             javax.xml.namespace*,
-                            javax.xml.parsers*,
-                            javax.xml.stream*,
                             javax.xml.transform*,
-                            org.xml.sax*,
                             org.w3c.dom*,
-                            org.springframework.beans*,
-                            org.springframework.core*,
-                            org.springframework.util*,
+                            org.springframework.xml*,
                             org.springframework.oxm*,
                             org.springframework.ws*,
-                            org.springframework.xml*,
+                            org.springframework*;version="[2.0,2.5]",
                             *;resolution:=optional
                         </Import-Package>
                         <Implementation-Title>${pom.name}</Implementation-Title>
diff --git a/core/pom.xml b/core/pom.xml
index 6783ee14..d823e340 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -73,7 +73,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -90,11 +90,10 @@
                             javax.xml.transform*,
                             org.xml.sax*,
                             org.w3c.dom*,
-                            org.springframework.beans*,
-                            org.springframework.core*,
-                            org.springframework.util*,
-                            org.springframework.oxm*,
                             org.springframework.xml*,
+                            org.springframework.oxm*,
+                            org.springframework.ws*,
+                            org.springframework*;version="[2.0,2.5]",
                             *;resolution:=optional
                         </Import-Package>
                         <Implementation-Title>${pom.name}</Implementation-Title>
diff --git a/oxm-tiger/pom.xml b/oxm-tiger/pom.xml
index 5e3bb9a0..817a9202 100644
--- a/oxm-tiger/pom.xml
+++ b/oxm-tiger/pom.xml
@@ -80,24 +80,23 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <excludeDependencies>true</excludeDependencies>
                     <instructions>
                         <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.springframework.oxm*</Export-Package>
+                        <Export-Package>
+                            org.springframework.oxm*
+                        </Export-Package>
                         <Import-Package>
                             org.apache.commons.logging*,
                             javax.xml.namespace*,
-                            javax.xml.parsers*,
                             javax.xml.stream*,
                             javax.xml.transform*,
-                            org.xml.sax*,
-                            org.w3c.dom*,
-                            org.springframework.beans*,
-                            org.springframework.core*,
-                            org.springframework.util*,
+                            org.springframework.xml*,
                             org.springframework.oxm*,
+                            org.springframework*;version="[2.0,2.5]",
                             *;resolution:=optional
                         </Import-Package>
                         <Implementation-Title>${pom.name}</Implementation-Title>
diff --git a/oxm/pom.xml b/oxm/pom.xml
index eb08af91..f55d2a84 100644
--- a/oxm/pom.xml
+++ b/oxm/pom.xml
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -90,10 +90,9 @@
                             javax.xml.transform*,
                             org.xml.sax*,
                             org.w3c.dom*,
-                            org.springframework.beans*,
-                            org.springframework.core*,
-                            org.springframework.util*,
                             org.springframework.xml*,
+                            org.springframework.oxm*,
+                            org.springframework*;version="[2.0,2.5]",
                             *;resolution:=optional
                         </Import-Package>
                         <Implementation-Title>${pom.name}</Implementation-Title>
diff --git a/parent/pom.xml b/parent/pom.xml
index 0acbcf7d..cda4f7cc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,6 +41,19 @@
             <layout>legacy</layout>
         </repository>
     </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>apache-snapshots</id>
+            <name>Apache Snapshots</name>
+            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
     <build>
         <extensions>
             <extension>
diff --git a/security/pom.xml b/security/pom.xml
index 8f67b56b..c57f4737 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -81,7 +81,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -89,12 +89,13 @@
                         <Export-Package>org.springframework.ws.soap.security*</Export-Package>
                         <Import-Package>
                             org.apache.commons.logging*,
+                            javax.crypto*,
+                            javax.security*,
+                            javax.xml.namespace*,
                             javax.xml.soap*,
                             com.sun.xml.wss*,
-                            org.springframework.beans*,
-                            org.springframework.core*,
-                            org.springframework.util*,
                             org.springframework.ws*,
+                            org.springframework*;version="[2.0,2.5]",
                             *;resolution:=optional
                         </Import-Package>
                         <Implementation-Title>${pom.name}</Implementation-Title>
diff --git a/support/pom.xml b/support/pom.xml
index 8e7fa3c6..868bb2bd 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -83,9 +83,10 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <excludeDependencies>true</excludeDependencies>
                     <instructions>
                         <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
                         <Export-Package>org.springframework.ws*</Export-Package>
@@ -94,10 +95,8 @@
                             javax.activation*,
                             javax.jms*,
                             javax.mail*,
-                            org.springframework.beans*,
-                            org.springframework.core*,
-                            org.springframework.util*,
-                            org.springframework.ws.transport*,
+                            org.springframework.ws*,
+                            org.springframework*;version="[2.0,2.5]",
                             *;resolution:=optional
                         </Import-Package>
                         <Implementation-Title>${pom.name}</Implementation-Title>
diff --git a/xml/pom.xml b/xml/pom.xml
index e988adef..dc36218b 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -29,7 +29,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>