diff --git a/core/pom.xml b/core/pom.xml
index a00363eb..20721eb2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -51,17 +51,6 @@
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <dependencies>
diff --git a/core/template.mf b/core/template.mf
index 0fbe5dc9..45479f08 100644
--- a/core/template.mf
+++ b/core/template.mf
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-Version: ${osgi.version}
 Bundle-ManifestVersion: 2
 Import-Template: 
- javax.activation.*;version="[1.1.0, 2.0.0)",
+ javax.activation.*;version="0",
  javax.servlet.*;version="[2.4.0, 3.0.0)",
  javax.wsdl.*;version="[1.6.1, 2.0.0)";resolution:=optional,
  javax.xml.bind.*;version="0";resolution:=optional,
@@ -12,8 +12,8 @@ Import-Template:
  javax.xml.parsers.*;version="0",
  javax.xml.transform.*;version="0",
  javax.xml.xpath.*;version="0",
- javax.xml.soap.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- javax.xml.stream.*;version="[1.0.1, 2.0.0)";resolution:=optional,
+ javax.xml.soap.*;version="0";resolution:=optional,
+ javax.xml.stream.*;version="0";resolution:=optional,
  nu.xom.*;version="[1.1.0, 2.0.0)";resolution:=optional,
  org.apache.axiom.*;version="[1.2.5, 2.0.0)";resolution:=optional,
  org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional,
diff --git a/parent/pom.xml b/parent/pom.xml
index d363ea6e..b0a1dcbf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
         <url>https://fisheye.springframework.org/browse/spring-ws/trunk</url>
     </scm>
     <properties>
-        <osgi.version>2.0.0.M4</osgi.version>
+        <osgi.version>2.0.1.RELEASE</osgi.version>
         <osgi.range>"${osgi.version:[=.=.=, =.=.+1)}"</osgi.range>
         <spring.framework.version>3.0.5.RELEASE</spring.framework.version>
         <spring.framework.osgi.range>"[3.0.5, 4.0.0)"</spring.framework.osgi.range>
diff --git a/security/template.mf b/security/template.mf
index 1a577de2..73932166 100644
--- a/security/template.mf
+++ b/security/template.mf
@@ -8,7 +8,7 @@ Import-Template:
  javax.crypto.*;version="0",
  javax.security.auth.*;version="0",
  javax.xml.namespace.*;version="0",
- javax.xml.soap.*;version="[1.1.0, 2.0.0)";resolution:=optional,
+ javax.xml.soap.*;version="0";resolution:=optional,
  net.sf.ehcache.*;version="2.0.0";resolution:=optional,
  org.apache.axiom.*;version="[1.2.5, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
diff --git a/support/template.mf b/support/template.mf
index d9b42156..f269602e 100644
--- a/support/template.mf
+++ b/support/template.mf
@@ -7,7 +7,7 @@ Fragment-Host: org.springframework.ws;bundle-version=${osgi.range}
 Import-Template: 
  com.sun.net.httpserver.*;version="0";resolution:=optional,
  com.sun.mail.imap.*;version="[1.4.0, 2.0.0)";resolution:=optional,
- javax.activation.*;version="[1.1.0, 2.0.0)",
+ javax.activation.*;version="0",
  javax.ejb.*;version="[2.0.0, 4.0.0)";resolution:=optional,
  javax.jms.*;version="[1.1.0, 2.0.0)",
  javax.mail.*;version="[1.4.0, 2.0.0)",
diff --git a/xml/template.mf b/xml/template.mf
index 65c1dfe3..df4997c0 100644
--- a/xml/template.mf
+++ b/xml/template.mf
@@ -7,7 +7,7 @@ Bundle-ManifestVersion: 2
 Import-Template: 
  javax.xml.namespace.*;version="0",
  javax.xml.parsers.*;version="0",
- javax.xml.stream.*;version="[1.0.1, 2.0.0)",
+ javax.xml.stream.*;version="0",
  javax.xml.transform.*;version="0",
  javax.xml.transform.stax.*;version="0";resolution:=optional,
  javax.xml.validation.*;version="0",