diff --git a/build.properties b/build.properties
index bd3ea184936..298b69a86e1 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,10 @@
+# DON'T forget to update spring-context manifest (Import-Package jpa entry)
 version=3.0.2
+# osgi ranges
+spring.osgi.range="${version:[=.=.=, =.=.+1)}"
+aj.osgi.range="[1.5.4, 2.0.0)"
+
+#
 release.type=integration
 natural.name=spring-framework
 project.name=Spring Framework
diff --git a/org.springframework.aop/.classpath b/org.springframework.aop/.classpath
index d15b4d1ac6a..7bc8238776b 100644
--- a/org.springframework.aop/.classpath
+++ b/org.springframework.aop/.classpath
@@ -1,21 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-2.5.1.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-sources-2.5.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/com.jamonapi/com.springsource.com.jamonapi/2.4.0/com.springsource.com.jamonapi-2.4.0.jar" sourcepath="/IVY_CACHE/com.jamonapi/com.springsource.com.jamonapi/2.4.0/com.springsource.com.jamonapi-sources-2.4.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.2.0/com.springsource.net.sf.cglib-2.2.0.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="/IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-sources-1.2.15.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.3.0/com.springsource.org.apache.commons.pool-1.3.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.3.0/com.springsource.org.apache.commons.pool-sources-1.3.0.jar"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-2.5.1.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-sources-2.5.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/com.jamonapi/com.springsource.com.jamonapi/2.4.0/com.springsource.com.jamonapi-2.4.0.jar" sourcepath="/IVY_CACHE/com.jamonapi/com.springsource.com.jamonapi/2.4.0/com.springsource.com.jamonapi-sources-2.4.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.2.0/com.springsource.net.sf.cglib-2.2.0.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="/IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-sources-1.2.15.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.3.0/com.springsource.org.apache.commons.pool-1.3.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.3.0/com.springsource.org.apache.commons.pool-sources-1.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.8.RELEASE/com.springsource.org.aspectj.weaver-1.6.8.RELEASE.jar" sourcepath="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.8.RELEASE/com.springsource.org.aspectj.weaver-sources-1.6.8.RELEASE.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.beans"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.core"/>
-	<classpathentry kind="lib" path="/org.springframework.asm/target/artifacts/org.springframework.asm.jar" sourcepath="/org.springframework.asm/target/artifacts/org.springframework.asm-sources.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.beans"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.core"/>
+	<classpathentry kind="lib" path="/org.springframework.asm/target/artifacts/org.springframework.asm.jar" sourcepath="/org.springframework.asm/target/artifacts/org.springframework.asm-sources.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.springframework.aop/template.mf b/org.springframework.aop/template.mf
index 31aa2811215..978ac2bb5bb 100644
--- a/org.springframework.aop/template.mf
+++ b/org.springframework.aop/template.mf
@@ -8,10 +8,10 @@ Import-Template:
  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,
- org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.aspectj.*;version=${aj.osgi.range};resolution:=optional,
+ org.springframework.beans.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,
diff --git a/org.springframework.aspects/template.mf b/org.springframework.aspects/template.mf
index f489268605c..7ba6ab8eae3 100644
--- a/org.springframework.aspects/template.mf
+++ b/org.springframework.aspects/template.mf
@@ -4,11 +4,11 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.transaction.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.orm.jpa.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.dao.*;version="[3.0.0, 3.0.1)";resolution:=optional
+ org.aspectj.*;version=${aj.osgi.range};resolution:=optional,
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.transaction.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.orm.jpa.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.dao.*;version=${spring.osgi.range};resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,
diff --git a/org.springframework.beans/template.mf b/org.springframework.beans/template.mf
index 5e2f62da881..0b8c0ed9850 100644
--- a/org.springframework.beans/template.mf
+++ b/org.springframework.beans/template.mf
@@ -8,8 +8,8 @@ Import-Template:
  javax.xml.*;version="0";resolution:=optional,
  net.sf.cglib.*;version="[2.1.3, 3.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
  org.xml.sax.*;version="0";resolution:=optional,
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
diff --git a/org.springframework.context.support/template.mf b/org.springframework.context.support/template.mf
index d2be27f499a..6a1ba004d7b 100644
--- a/org.springframework.context.support/template.mf
+++ b/org.springframework.context.support/template.mf
@@ -16,13 +16,13 @@ Import-Template:
  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="[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.*;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)"
+ org.springframework.context.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.jdbc.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.jndi.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.scheduling.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.transaction.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.util.*;version=${spring.osgi.range}
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,
diff --git a/org.springframework.context/template.mf b/org.springframework.context/template.mf
index 8e4717920fd..a4603935866 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, 3.0.0)";resolution:=optional,
- org.springframework.orm.jpa.support;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.orm.jpa.support;version="[3.0.2,3.0.3)";resolution:=optional,
  com.ibm.websphere.management;version="0";resolution:=optional
 Import-Template: 
  bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional,
@@ -25,17 +25,17 @@ Import-Template:
  net.sf.cglib.*;version="[2.1.3, 3.0.0)";resolution:=optional,
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional,
+ org.aspectj.weaver.*;version=${aj.osgi.range};resolution:=optional,
  org.codehaus.groovy.*;version="[1.5.0, 2.0.0)";resolution:=optional,
  org.joda.*;version="[1.6.0, 2.0.0)";resolution:=optional,
  org.jruby.*;version="[1.1.0, 2.0.0)";resolution:=optional,
  org.omg.CORBA.*;version="0";resolution:=optional,
- org.springframework.aop.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.expression.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.aop.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.expression.*;version=${spring.osgi.range};resolution:=optional,
  org.springframework.instrument.*;version="0";resolution:=optional,
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.springframework.util.*;version=${spring.osgi.range},
  org.xml.sax.*;version="0";resolution:=optional,
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
diff --git a/org.springframework.core/.classpath b/org.springframework.core/.classpath
index 4a34bec33f2..5912377d8aa 100644
--- a/org.springframework.core/.classpath
+++ b/org.springframework.core/.classpath
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="/IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-sources-1.2.15.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.6.0.jar"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="/IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-sources-1.2.15.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.6.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.8.RELEASE/com.springsource.org.aspectj.weaver-1.6.8.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-1.2.0.jar" sourcepath="/IVY_CACHE/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-sources-1.2.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-2.5.1.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-sources-2.5.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.codehaus.woodstox/com.springsource.com.ctc.wstx/3.2.7/com.springsource.com.ctc.wstx-3.2.7.jar" sourcepath="/IVY_CACHE/org.codehaus.woodstox/com.springsource.com.ctc.wstx/3.2.7/com.springsource.com.ctc.wstx-sources-3.2.7.jar"/>
-	<classpathentry kind="lib" path="/org.springframework.asm/target/artifacts/org.springframework.asm.jar" sourcepath="/org.springframework.asm/target/artifacts/org.springframework.asm-sources.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.jboss.vfs/com.springsource.org.jboss.virtual/2.1.0.GA/com.springsource.org.jboss.virtual-2.1.0.GA.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-1.2.0.jar" sourcepath="/IVY_CACHE/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-sources-1.2.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-2.5.1.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-sources-2.5.1.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.codehaus.woodstox/com.springsource.com.ctc.wstx/3.2.7/com.springsource.com.ctc.wstx-3.2.7.jar" sourcepath="/IVY_CACHE/org.codehaus.woodstox/com.springsource.com.ctc.wstx/3.2.7/com.springsource.com.ctc.wstx-sources-3.2.7.jar"/>
+	<classpathentry kind="lib" path="D:/work/i21/spring.svn/trunk/org.springframework.asm/target/artifacts/org.springframework.asm.jar" sourcepath="/org.springframework.asm/target/artifacts/org.springframework.asm-sources.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.jboss.vfs/com.springsource.org.jboss.virtual/2.1.0.GA/com.springsource.org.jboss.virtual-2.1.0.GA.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.springframework.core/template.mf b/org.springframework.core/template.mf
index 218e9ab926c..ca1bb01cce0 100644
--- a/org.springframework.core/template.mf
+++ b/org.springframework.core/template.mf
@@ -7,9 +7,9 @@ Import-Package:
 Import-Template: 
  javax.xml.*;version="0";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.springframework.asm.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.asm.*;version=${spring.osgi.range};resolution:=optional,
  org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional,
- org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional,
+ org.aspectj.*;version=${aj.osgi.range};resolution:=optional,
  org.jboss.virtual.*;version="[2.1.0.GA, 3.0.0)";resolution:=optional,
  org.xml.sax.*;version="0";resolution:=optional,
  org.w3c.dom.*;version="0";resolution:=optional
diff --git a/org.springframework.expression/template.mf b/org.springframework.expression/template.mf
index 3d90bfbdeb5..1b1b2d80b44 100644
--- a/org.springframework.expression/template.mf
+++ b/org.springframework.expression/template.mf
@@ -4,5 +4,5 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)"
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range}
diff --git a/org.springframework.jdbc/template.mf b/org.springframework.jdbc/template.mf
index 8af078c1a56..8c89b0a00a6 100644
--- a/org.springframework.jdbc/template.mf
+++ b/org.springframework.jdbc/template.mf
@@ -21,12 +21,12 @@ Import-Template:
  org.hsqldb.*;version="[1.8.0, 2.0.0)";resolution:=optional,
  org.apache.derby.*;version="[10.5.0, 11.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- 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)",
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.dao.*;version=${spring.osgi.range},
+ org.springframework.jndi.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.transaction.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,
diff --git a/org.springframework.jms/template.mf b/org.springframework.jms/template.mf
index 001f9a59aba..ddc628ef5df 100644
--- a/org.springframework.jms/template.mf
+++ b/org.springframework.jms/template.mf
@@ -11,17 +11,17 @@ Import-Template:
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  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.springframework.aop.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.context.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.jca.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.jndi.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.oxm.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.remoting.*;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)",
+ org.springframework.aop.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.context.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.jca.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.jndi.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.oxm.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.remoting.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.scheduling.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.transaction.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.util.*;version=${spring.osgi.range},
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,
diff --git a/org.springframework.orm/template.mf b/org.springframework.orm/template.mf
index f53a6462b2e..259978f48ff 100644
--- a/org.springframework.orm/template.mf
+++ b/org.springframework.orm/template.mf
@@ -22,18 +22,18 @@ Import-Template:
  org.apache.openjpa.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional,
  org.eclipse.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional,
  org.hibernate.*;version="[3.2.0, 4.0.0)";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.*;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,
+ org.springframework.aop.*;version=${spring.osgi.range},
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.context.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.dao.*;version=${spring.osgi.range},
+ org.springframework.instrument.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.jdbc.*;version=${spring.osgi.range},
+ org.springframework.jndi.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.transaction.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
+ org.springframework.web.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.ui.*;version=${spring.osgi.range};resolution:=optional,
  org.xml.sax.*;version="0";resolution:=optional,
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
diff --git a/org.springframework.oxm/template.mf b/org.springframework.oxm/template.mf
index ab07ab571eb..5cf0002e593 100644
--- a/org.springframework.oxm/template.mf
+++ b/org.springframework.oxm/template.mf
@@ -11,9 +11,9 @@ Import-Template:
  org.apache.xmlbeans.*;version="[2.2.0, 3.0.0)";resolution:=optional,
  org.exolab.castor.*;version="[1.2.0, 2.0.0)";resolution:=optional,
  org.jibx.runtime.*;version="[1.1.5, 2.0.0)";resolution:=optional,
- 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)",
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
  org.w3c.dom.*;version="0",
  org.xml.sax.*;version="0"
 Ignored-Existing-Headers: 
diff --git a/org.springframework.test/template.mf b/org.springframework.test/template.mf
index e23816d5a10..091ed850969 100644
--- a/org.springframework.test/template.mf
+++ b/org.springframework.test/template.mf
@@ -16,9 +16,9 @@ Import-Template:
  junit.framework.*;version="[3.8.2, 5.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.taglibs.standard.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional,
+ org.aspectj.weaver.*;version=${aj.osgi.range};resolution:=optional,
  org.junit.*;version="[4.7.0, 5.0.0)";resolution:=optional,
- org.springframework.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.*;version=${spring.osgi.range};resolution:=optional,
  org.testng.*;version="[5.10.0, 6.0.0)";resolution:=optional,
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
diff --git a/org.springframework.transaction/template.mf b/org.springframework.transaction/template.mf
index 326d381a0bf..19cb22e183c 100644
--- a/org.springframework.transaction/template.mf
+++ b/org.springframework.transaction/template.mf
@@ -15,14 +15,14 @@ Import-Template:
  javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.springframework.aop.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.context.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.core.*;version="[3.0.0, 3.0.1)",
- 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.stereotype;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.springframework.aop.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.context.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.jndi.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.scheduling.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.stereotype;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.util.*;version=${spring.osgi.range},
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,
diff --git a/org.springframework.web.portlet/template.mf b/org.springframework.web.portlet/template.mf
index 8f6e4a2dc9a..52769b348f3 100644
--- a/org.springframework.web.portlet/template.mf
+++ b/org.springframework.web.portlet/template.mf
@@ -8,15 +8,15 @@ Import-Template:
  javax.xml.*;version="0";resolution:=optional,
  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="[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.http.*;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)",
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.context.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.http.*;version=${spring.osgi.range},
+ org.springframework.stereotype;version=${spring.osgi.range},
+ org.springframework.ui.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
+ org.springframework.validation.*;version=${spring.osgi.range},
+ org.springframework.web.*;version=${spring.osgi.range},
  org.xml.sax.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,
diff --git a/org.springframework.web.servlet/template.mf b/org.springframework.web.servlet/template.mf
index 57677e38888..ec0cb26f9d7 100644
--- a/org.springframework.web.servlet/template.mf
+++ b/org.springframework.web.servlet/template.mf
@@ -22,18 +22,18 @@ Import-Template:
  org.apache.velocity.*;version="[1.5.0, 2.0.0)";resolution:=optional,
  org.apache.velocity.tools.*;version="[1.4.0, 3.0.0)";resolution:=optional,
  org.codehaus.jackson.*;version="[1.0.0, 1.1.0)";resolution:=optional,
- 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.expression.*;version="[3.0.0, 3.0.1)",
- org.springframework.format.*;version="[3.0.0, 3.0.1)",
- org.springframework.http.*;version="[3.0.0, 3.0.1)",
- org.springframework.oxm.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- 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)",
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.context.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.expression.*;version=${spring.osgi.range},
+ org.springframework.format.*;version=${spring.osgi.range},
+ org.springframework.http.*;version=${spring.osgi.range},
+ org.springframework.oxm.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.stereotype;version=${spring.osgi.range},
+ org.springframework.ui.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
+ org.springframework.validation.*;version=${spring.osgi.range}, 
+ org.springframework.web.*;version=${spring.osgi.range},
  org.xml.sax.*;version="0";resolution:=optional,
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
diff --git a/org.springframework.web.struts/template.mf b/org.springframework.web.struts/template.mf
index 5d545c65929..7349e81badf 100644
--- a/org.springframework.web.struts/template.mf
+++ b/org.springframework.web.struts/template.mf
@@ -13,11 +13,11 @@ Import-Template:
  org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
  org.apache.commons.validator.*;version="[1.1.4, 2.0.0)",
  org.apache.struts.*;version="[1.2.9, 2.0.0)",
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.context.*;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)",
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.context.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
+ org.springframework.validation.*;version=${spring.osgi.range},
+ org.springframework.web.*;version=${spring.osgi.range},
  org.xml.sax.*;version="0"
 Ignored-Existing-Headers: 
  Bnd-LastModified,
diff --git a/org.springframework.web/template.mf b/org.springframework.web/template.mf
index b6ef921664b..8fdc0a46073 100644
--- a/org.springframework.web/template.mf
+++ b/org.springframework.web/template.mf
@@ -20,15 +20,15 @@ Import-Template:
  org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.log4j.*;version="[1.2.15, 2.0.0)";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.oxm.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- 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)",
- org.springframework.validation.*;version="[3.0.0, 3.0.1)", 
+ org.springframework.aop.*;version=${spring.osgi.range},
+ org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.context.*;version=${spring.osgi.range},
+ org.springframework.core.*;version=${spring.osgi.range},
+ org.springframework.oxm.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.remoting.*;version=${spring.osgi.range};resolution:=optional,
+ org.springframework.ui.*;version=${spring.osgi.range},
+ org.springframework.util.*;version=${spring.osgi.range},
+ org.springframework.validation.*;version=${spring.osgi.range}, 
  org.xml.sax.*;version="0";resolution:=optional,
  org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: