diff --git a/org.springframework.aop/template.mf b/org.springframework.aop/template.mf
index 4cf5a82f99c..6d94fb80be9 100644
--- a/org.springframework.aop/template.mf
+++ b/org.springframework.aop/template.mf
@@ -9,8 +9,8 @@ Import-Template:
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional,
  org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]"
+ org.springframework.beans.*;version="[3.0.0, 3.0.1)",
+ 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 0eb68c80105..64d4b15032b 100644
--- a/org.springframework.beans/template.mf
+++ b/org.springframework.beans/template.mf
@@ -6,8 +6,8 @@ Import-Template:
  javax.el.*;version="[2.1.0, 3.0.0)";resolution:=optional,
  net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.springframework.core.*;version="[3.0.0, 3.0.0]",
- org.springframework.util.*;version="[3.0.0, 3.0.0]",
+ 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.*,
diff --git a/org.springframework.context.support/template.mf b/org.springframework.context.support/template.mf
index 0538604c5b9..f5e37e87728 100644
--- a/org.springframework.context.support/template.mf
+++ b/org.springframework.context.support/template.mf
@@ -13,14 +13,14 @@ Import-Template:
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)";resolution:=optional,
  org.apache.velocity.*;version="[1.5.0, 2.0.0)";resolution:=optional,
  org.quartz.*;version="[1.6.0, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.jdbc.datasource.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.jndi.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.scheduling.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.transaction.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]"
+ org.springframework.beans.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.context.*;version="[3.0.0, 3.0.1)",
+ org.springframework.core.*;version="[3.0.0, 3.0.1)",
+ org.springframework.jdbc.datasource.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.jndi.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.scheduling.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ 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.*
diff --git a/org.springframework.context/template.mf b/org.springframework.context/template.mf
index a1550ca873b..84cd12aeae2 100644
--- a/org.springframework.context/template.mf
+++ b/org.springframework.context/template.mf
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
  javax.persistence;version="[1.0.0, 2.0.0)";resolution:=optional,
- org.springframework.orm.jpa.support;version="[2.5.5.A, 2.5.5.A]";resolution:=optional
+ org.springframework.orm.jpa.support;version="[3.0.0, 3.0.1)";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,
@@ -24,12 +24,12 @@ Import-Template:
  org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional,
  org.codehaus.groovy.*;version="[1.5.1, 2.0.0)";resolution:=optional,
  org.jruby.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- org.springframework.aop.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.instrument.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.metadata.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]"
+ org.springframework.aop.*;version="[3.0.0, 3.0.1)",
+ org.springframework.beans.*;version="[3.0.0, 3.0.1)",
+ org.springframework.core.*;version="[3.0.0, 3.0.1)",
+ org.springframework.instrument.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ 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.*,
diff --git a/org.springframework.jdbc/template.mf b/org.springframework.jdbc/template.mf
index fd7b0bd96ef..c2c6a1b29b4 100644
--- a/org.springframework.jdbc/template.mf
+++ b/org.springframework.jdbc/template.mf
@@ -9,12 +9,12 @@ Import-Template:
  javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.enhydra.jdbc.*;version="[1.5.0, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.dao.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.jndi.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.transaction.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.util;version="[2.5.5.A, 2.5.5.A]"
+ org.springframework.beans.*;version="[3.0.0, 3.0.1)",
+ org.springframework.core.*;version="[3.0.0, 3.0.1)",
+ org.springframework.dao.*;version="[3.0.0, 3.0.1)",
+ org.springframework.jndi.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ 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,
diff --git a/org.springframework.orm/template.mf b/org.springframework.orm/template.mf
index 5bcb704cfae..fbcc220beab 100644
--- a/org.springframework.orm/template.mf
+++ b/org.springframework.orm/template.mf
@@ -49,18 +49,18 @@ Import-Template:
  org.hibernate.type;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
  org.hibernate.usertype;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
  org.hibernate.util;version="[3.2.6.ga, 3.3.0)";resolution:=optional,
- org.springframework.aop.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.dao.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.instrument.classloading.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.jdbc.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.jndi.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.transaction.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.web.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.ui.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional
+ org.springframework.aop.*;version="[3.0.0, 3.0.1)",
+ org.springframework.beans.*;version="[3.0.0, 3.0.1)",
+ org.springframework.context.*;version="[3.0.0, 3.0.1)",
+ org.springframework.core.*;version="[3.0.0, 3.0.1)",
+ org.springframework.dao.*;version="[3.0.0, 3.0.1)",
+ org.springframework.instrument.classloading.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.jdbc.*;version="[3.0.0, 3.0.1)",
+ org.springframework.jndi.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.transaction.*;version="[3.0.0, 3.0.1)",
+ org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ 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.*,
diff --git a/org.springframework.transaction/template.mf b/org.springframework.transaction/template.mf
index 7a415657c1c..d5cd55e39c6 100644
--- a/org.springframework.transaction/template.mf
+++ b/org.springframework.transaction/template.mf
@@ -3,7 +3,7 @@ Bundle-Name: Spring Transaction
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
- org.springframework.stereotype;version="[2.5.5.A, 2.5.5.A]"
+ org.springframework.stereotype;version="[3.0.0, 3.0.1)"
 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, 
@@ -12,14 +12,14 @@ Import-Template:
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.objectweb.jotm.*;version="[2.0.10, 3.0.0)";resolution:=optional,
- org.springframework.aop.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.jndi.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.metadata.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.scheduling.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]"
+ org.springframework.aop.*;version="[3.0.0, 3.0.1)",
+ org.springframework.beans.*;version="[3.0.0, 3.0.1)",
+ org.springframework.context.*;version="[3.0.0, 3.0.1)",
+ org.springframework.core.*;version="[3.0.0, 3.0.1)",
+ org.springframework.jndi.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.metadata.*;version="[3.0.0, 3.0.1)",
+ 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.*,
diff --git a/org.springframework.web.portlet/template.mf b/org.springframework.web.portlet/template.mf
index 6c2dbd06d23..f5011c00e8b 100644
--- a/org.springframework.web.portlet/template.mf
+++ b/org.springframework.web.portlet/template.mf
@@ -7,14 +7,14 @@ Import-Template:
  javax.servlet.*;version="[2.4.0, 3.0.0)",
  org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.stereotype;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.ui.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.validation.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.web.*;version="[2.5.5.A, 2.5.5.A]"
+ org.springframework.beans.*;version="[3.0.0, 3.0.1)",
+ org.springframework.context.*;version="[3.0.0, 3.0.1)",
+ org.springframework.core.*;version="[3.0.0, 3.0.1)",
+ org.springframework.stereotype;version="[3.0.0, 3.0.1)",
+ org.springframework.ui.*;version="[3.0.0, 3.0.1)",
+ org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ 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: 
diff --git a/org.springframework.web.servlet/template.mf b/org.springframework.web.servlet/template.mf
index 931c108037e..687dc23a9f8 100644
--- a/org.springframework.web.servlet/template.mf
+++ b/org.springframework.web.servlet/template.mf
@@ -3,7 +3,7 @@ Bundle-Name: Spring Web Servlet
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
- org.springframework.stereotype;version="[2.5.5.A, 2.5.5.A]",
+ org.springframework.stereotype;version="[3.0.0, 3.0.1)",
  org.apache.tiles.definition;version="[2.0.5.osgi, 3.0.0)";resolution:=optional,
  org.apache.tiles.jsp.context;version="[2.0.5, 3.0.0)";resolution:=optional
 Import-Template: 
@@ -35,13 +35,13 @@ Import-Template:
  org.apache.velocity.runtime.*;version="[1.5.0, 2.0.0)";resolution:=optional,
  org.apache.velocity.tools.generic;version="[1.4.0, 2.0.0)";resolution:=optional,
  org.apache.velocity.tools.view.*;version="[1.4.0, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.ui.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.validation.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.web.*;version="[2.5.5.A, 2.5.5.A]"
+ org.springframework.beans.*;version="[3.0.0, 3.0.1)",
+ org.springframework.context.*;version="[3.0.0, 3.0.1)",
+ org.springframework.core.*;version="[3.0.0, 3.0.1)",
+ org.springframework.ui.*;version="[3.0.0, 3.0.1)",
+ org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ 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.*,
diff --git a/org.springframework.web/template.mf b/org.springframework.web/template.mf
index a755864e08e..b721cead376 100644
--- a/org.springframework.web/template.mf
+++ b/org.springframework.web/template.mf
@@ -20,13 +20,13 @@ Import-Template:
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional,
  org.apache.taglibs.*;version="[1.1.2, 2.0.0)";resolution:=optional,
- org.springframework.aop.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.beans.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.context.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.core.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.remoting.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
- org.springframework.ui.*;version="[2.5.5.A, 2.5.5.A]",
- org.springframework.util.*;version="[2.5.5.A, 2.5.5.A]"
+ org.springframework.aop.*;version="[3.0.0, 3.0.1)",
+ org.springframework.beans.*;version="[3.0.0, 3.0.1)",
+ org.springframework.context.*;version="[3.0.0, 3.0.1)",
+ org.springframework.core.*;version="[3.0.0, 3.0.1)",
+ org.springframework.remoting.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ 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.*,