diff --git a/org.springframework.aop/template.mf b/org.springframework.aop/template.mf
index 6d94fb80be9..270f3a621cc 100644
--- a/org.springframework.aop/template.mf
+++ b/org.springframework.aop/template.mf
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  com.jamonapi.*;version="[2.4.0, 3.0.0)";resolution:=optional,
- net.sf.cglib.*;version="[2.1.3, 3.0.0)";resolution:=optional,
+ net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional,
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional,
@@ -13,4 +13,4 @@ Import-Template:
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
  org.springframework.util.*;version="[3.0.0, 3.0.1)"
 Unversioned-Imports: 
- org.w3c.dom.*
+ *
diff --git a/org.springframework.beans/template.mf b/org.springframework.beans/template.mf
index 4d369221ede..d3b260f53f2 100644
--- a/org.springframework.beans/template.mf
+++ b/org.springframework.beans/template.mf
@@ -9,6 +9,5 @@ Import-Template:
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
  org.springframework.util.*;version="[3.0.0, 3.0.1)",
 Unversioned-Imports: 
- javax.xml.parsers.*,
- org.w3c.dom.*,
- org.xml.sax.*
+ *
+
diff --git a/org.springframework.context.support/template.mf b/org.springframework.context.support/template.mf
index f5e37e87728..22f8c1b4ab9 100644
--- a/org.springframework.context.support/template.mf
+++ b/org.springframework.context.support/template.mf
@@ -22,8 +22,7 @@ Import-Template:
  org.springframework.transaction.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.util.*;version="[3.0.0, 3.0.1)"
 Unversioned-Imports: 
- javax.naming.*,
- javax.sql.*
+ *
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,
diff --git a/org.springframework.context/template.mf b/org.springframework.context/template.mf
index eea9f11080e..cdbf271889a 100644
--- a/org.springframework.context/template.mf
+++ b/org.springframework.context/template.mf
@@ -5,6 +5,7 @@ Bundle-ManifestVersion: 2
 Import-Package: 
  javax.persistence;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.springframework.orm.jpa.support;version="[3.0.0, 3.0.1)";resolution:=optional
+ com.ibm.websphere.management;resolution:=optional
 Import-Template: 
  bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional,
  com.sun.enterprise.loader.*;version="[1.0.0, 2.0.0)";resolution:=optional,
@@ -17,7 +18,7 @@ Import-Template:
  javax.persistence.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional,
  javax.xml.ws.*;version="[2.1.1, 3.0.0)";resolution:=optional,
- net.sf.cglib.*;version="[2.1.3, 3.0.0)";resolution:=optional,
+ net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional,
  oracle.classloader.*;version="[10.1.3.1, 10.2.0.0)";resolution:=optional,
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
@@ -32,15 +33,7 @@ Import-Template:
  org.springframework.metadata.*;version="[3.0.0, 3.0.1)",
  org.springframework.util.*;version="[3.0.0, 3.0.1)"
 Unversioned-Imports: 
- com.sun.net.*,
- javax.management.*,
- javax.naming.*,
- javax.rmi.*,
- javax.xml.namespace.*,
- org.omg.CORBA.*,
- org.omg.CORBA_2_3.*,
- org.w3c.dom.*,
- org.xml.sax.*
+ *
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,
diff --git a/org.springframework.core/template.mf b/org.springframework.core/template.mf
index 4a15825dd92..94327ee9d16 100644
--- a/org.springframework.core/template.mf
+++ b/org.springframework.core/template.mf
@@ -2,6 +2,8 @@ Bundle-SymbolicName: org.springframework.core
 Bundle-Name: Spring Core
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
+Import-Package: 
+ org.eclipse.core.runtime;common="split";resolution:=optional
 Import-Template: 
  edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional,
  org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional,
@@ -10,6 +12,4 @@ Import-Template:
  org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional,
  org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional
 Unversioned-Imports: 
- javax.xml.transform.*,
- org.w3c.dom.*,
- org.xml.sax.*
\ No newline at end of file
+ *
diff --git a/org.springframework.expression/template.mf b/org.springframework.expression/template.mf
index 6c00acd95d3..992caf89da7 100644
--- a/org.springframework.expression/template.mf
+++ b/org.springframework.expression/template.mf
@@ -5,4 +5,5 @@ Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.core;version="[3.0.0, 3.0.1)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.antlr.runtime;version="[3.0.0,3.0.1)", org.antlr.runtime.tree;version="[3.0.0,3.0.1)"
\ No newline at end of file
+ org.antlr.runtime;version="[3.0.0,3.0.1)",
+ org.antlr.runtime.tree;version="[3.0.0,3.0.1)"
diff --git a/org.springframework.jdbc/template.mf b/org.springframework.jdbc/template.mf
index c2c6a1b29b4..58bf26163aa 100644
--- a/org.springframework.jdbc/template.mf
+++ b/org.springframework.jdbc/template.mf
@@ -2,6 +2,12 @@ Bundle-SymbolicName: org.springframework.jdbc
 Bundle-Name: Spring JDBC
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
+Import-Package: 
+ oracle.sql;resolution:=optional,
+ org.jboss.resource.adapter.jdbc;resolution:=optional,
+ weblogic.jdbc.extensions;resolution:=optional,
+ com.ibm.websphere.rsadapter;resolution:=optional,
+ com.ibm.ws.rsadapter.jdbc;resolution:=optional
 Import-Template: 
  com.mchange.v2.c3p0.*;version="[0.9.1.2, 1.0.0)";resolution:=optional,
  com.sun.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional,
@@ -16,7 +22,4 @@ Import-Template:
  org.springframework.transaction.*;version="[3.0.0, 3.0.1)",
  org.springframework.util;version="[3.0.0, 3.0.1)"
 Unversioned-Imports: 
- javax.naming.*,
- javax.sql,
- javax.xml.transform.*,
- org.w3c.dom.*
+ *
diff --git a/org.springframework.jms/template.mf b/org.springframework.jms/template.mf
index 04378c18d81..d343789d0cf 100644
--- a/org.springframework.jms/template.mf
+++ b/org.springframework.jms/template.mf
@@ -20,8 +20,7 @@ Import-Template:
  org.springframework.transaction.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.util.*;version="[3.0.0, 3.0.1)"
 Unversioned-Imports: 
- javax.naming.*,
- org.w3c.dom.*
+ *
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,
diff --git a/org.springframework.orm/template.mf b/org.springframework.orm/template.mf
index fbcc220beab..cc1ecaeab1b 100644
--- a/org.springframework.orm/template.mf
+++ b/org.springframework.orm/template.mf
@@ -62,11 +62,7 @@ Import-Template:
  org.springframework.web.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.ui.*;version="[3.0.0, 3.0.1)";resolution:=optional
 Unversioned-Imports: 
- javax.naming.*,
- javax.sql.*,
- javax.xml.parsers.*,
- org.w3c.dom.*,
- org.xml.sax
+ *
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  DynamicImport-Package,
diff --git a/org.springframework.test/template.mf b/org.springframework.test/template.mf
index b534064ac20..5dd95ba999a 100644
--- a/org.springframework.test/template.mf
+++ b/org.springframework.test/template.mf
@@ -14,11 +14,10 @@ Import-Template:
  org.apache.taglibs.standard.*;version="[1.1.2, 2.0.0)";resolution:=optional,
  org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional,
  org.junit.*;version="[4.5.0, 5.0.0)";resolution:=optional,
- org.springframework.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
+ org.springframework.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.testng.*;version="[5.8.0, 6.0.0)";resolution:=optional
 Unversioned-Imports: 
- javax.naming.*,
- javax.sql
+ *
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,
diff --git a/org.springframework.transaction/template.mf b/org.springframework.transaction/template.mf
index d5cd55e39c6..adb3751de76 100644
--- a/org.springframework.transaction/template.mf
+++ b/org.springframework.transaction/template.mf
@@ -4,6 +4,9 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
  org.springframework.stereotype;version="[3.0.0, 3.0.1)"
+ com.ibm.ws.Transaction;resolution:=optional,
+ oracle.j2ee.transaction;resolution:=optional,
+ weblogic.transaction;resolution:=optional
 Import-Template: 
  com.ibm.wsspi.uow.*;version="[6.0.2.17, 6.1.0)";resolution:=optional,
  javax.ejb.*;version="[3.0.0, 4.0.0)";resolution:=optional, 
@@ -21,6 +24,4 @@ Import-Template:
  org.springframework.scheduling.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.util.*;version="[3.0.0, 3.0.1)"
 Unversioned-Imports: 
- javax.management.*,
- javax.naming.*,
- org.w3c.dom.*
+ *
diff --git a/org.springframework.web.portlet/template.mf b/org.springframework.web.portlet/template.mf
index f5011c00e8b..9814039a48d 100644
--- a/org.springframework.web.portlet/template.mf
+++ b/org.springframework.web.portlet/template.mf
@@ -16,7 +16,7 @@ Import-Template:
  org.springframework.validation.*;version="[3.0.0, 3.0.1)",
  org.springframework.web.*;version="[3.0.0, 3.0.1)"
 Unversioned-Imports: 
- org.xml.sax.*
+ *
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,
diff --git a/org.springframework.web.servlet/template.mf b/org.springframework.web.servlet/template.mf
index 07833afe2c8..9a257c8a58a 100644
--- a/org.springframework.web.servlet/template.mf
+++ b/org.springframework.web.servlet/template.mf
@@ -44,10 +44,7 @@ Import-Template:
  org.springframework.validation.*;version="[3.0.0, 3.0.1)",
  org.springframework.web.*;version="[3.0.0, 3.0.1)"
 Unversioned-Imports: 
- javax.sql.*,
- javax.xml.transform.*,
- org.w3c.dom.*,
- org.xml.sax.*
+ *
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,
diff --git a/org.springframework.web/template.mf b/org.springframework.web/template.mf
index ecb102eb6a5..281ae52dc8c 100644
--- a/org.springframework.web/template.mf
+++ b/org.springframework.web/template.mf
@@ -27,10 +27,7 @@ Import-Template:
  org.springframework.ui.*;version="[3.0.0, 3.0.1)",
  org.springframework.util.*;version="[3.0.0, 3.0.1)"
 Unversioned-Imports: 
- com.sun.net.*,
- javax.jws.*,
- javax.xml.namespace.*,
- org.xml.sax.*
+ *
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,