diff --git a/build.gradle b/build.gradle
index 3c3a2eb858e..1b9cce6556e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,6 @@ buildscript {
     }
     dependencies {
         classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.1.2-SNAPSHOT'
-        classpath 'org.springframework.build.gradle:bundlor-plugin:0.1.2-SNAPSHOT'
     }
 }
 
@@ -29,7 +28,6 @@ configure(allprojects) {
     repositories {
         maven { url "http://repo.springsource.org/libs-release" }
         maven { url "http://repo.springsource.org/ebr-maven-external" }
-        maven { url "http://repo.springsource.org/plugins-release" }
     }
 
     dependencies {
@@ -81,16 +79,6 @@ configure(subprojects) { subproject ->
     }
 }
 
-configure(subprojects - project(":spring-aspects")) {
-    apply plugin: 'bundlor'
-    bundlor {
-        manifestTemplate = new File("${projectDir}/template.mf").text
-            .replace('${spring.osgi.range}', /"[$version, $version]"/)
-            .replace('${aj.osgi.range}', '"[1.6.8, 2.0.0)"')
-    }
-}
-
-
 
 project("spring-asm") {
     description = 'Spring ASM'
diff --git a/spring-aop/template.mf b/spring-aop/template.mf
deleted file mode 100644
index 978ac2bb5bb..00000000000
--- a/spring-aop/template.mf
+++ /dev/null
@@ -1,20 +0,0 @@
-Bundle-SymbolicName: org.springframework.aop
-Bundle-Name: Spring AOP
-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,
- 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=${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,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-asm/template.mf b/spring-asm/template.mf
deleted file mode 100644
index 5e28af1ad3b..00000000000
--- a/spring-asm/template.mf
+++ /dev/null
@@ -1,6 +0,0 @@
-Bundle-SymbolicName: org.springframework.asm
-Bundle-Name: Spring ASM
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Ignored-Existing-Headers: 
- Import-Package
diff --git a/spring-aspects/template.mf b/spring-aspects/template.mf
deleted file mode 100644
index 27543caee4b..00000000000
--- a/spring-aspects/template.mf
+++ /dev/null
@@ -1,20 +0,0 @@
-Bundle-SymbolicName: org.springframework.aspects
-Bundle-Name: Spring Aspects
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Template: 
- javax.persistence;version="[1.0.0,3.0.0)";resolution:=optional,
- org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.aspectj.*;version=${aj.osgi.range};resolution:=optional,
- org.springframework.context.*;version=${spring.osgi.range},
- org.springframework.beans.*;version=${spring.osgi.range},
- org.springframework.cache.*;version=${spring.osgi.range};resolution:=optional,
- org.springframework.core.*;version=${spring.osgi.range},
- org.springframework.dao.*;version=${spring.osgi.range};resolution:=optional,
- org.springframework.orm.*;version=${spring.osgi.range};resolution:=optional,
- org.springframework.scheduling.*;version=${spring.osgi.range};resolution:=optional,
- org.springframework.transaction.*;version=${spring.osgi.range};resolution:=optional
-Ignored-Existing-Headers: 
- Bnd-LastModified,
- Import-Package,
- Tool
diff --git a/spring-beans/template.mf b/spring-beans/template.mf
deleted file mode 100644
index 0b8c0ed9850..00000000000
--- a/spring-beans/template.mf
+++ /dev/null
@@ -1,19 +0,0 @@
-Bundle-SymbolicName: org.springframework.beans
-Bundle-Name: Spring Beans
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Template: 
- javax.el.*;version="[1.0.0, 3.0.0)";resolution:=optional,
- javax.inject.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- 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=${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: 
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-context-support/template.mf b/spring-context-support/template.mf
deleted file mode 100644
index de11ed0d393..00000000000
--- a/spring-context-support/template.mf
+++ /dev/null
@@ -1,33 +0,0 @@
-Bundle-SymbolicName: org.springframework.context.support
-Bundle-Name: Spring Context Support
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Template: 
- commonj.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- freemarker.*;version="[2.3.14, 3.0.0)";resolution:=optional,
- javax.activation.*;version="0";resolution:=optional,
- javax.mail.*;version="[1.4.0, 2.0.0)";resolution:=optional,
- javax.naming.*;version="0";resolution:=optional,
- javax.sql.*;version="0";resolution:=optional,
- net.sf.jasperreports.*;version="[2.0.5, 4.0.0)";resolution:=optional,
- org.aopalliance.*;version="[1.0.0, 2.0.0)",
- org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional,
- 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, 3.0.0)";resolution:=optional,
- org.w3c.dom.*;version="0";resolution:=optional,
- org.springframework.aop.*;version=${spring.osgi.range};resolution:=optional,
- org.springframework.beans.*;version=${spring.osgi.range};resolution:=optional,
- org.springframework.context.*;version=${spring.osgi.range},
- org.springframework.core.*;version=${spring.osgi.range},
- org.springframework.expression.*;version=${spring.osgi.range};resolution:=optional,
- 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,
- Export-Package,
- Tool
diff --git a/spring-context/template.mf b/spring-context/template.mf
deleted file mode 100644
index 19cae29fd6c..00000000000
--- a/spring-context/template.mf
+++ /dev/null
@@ -1,47 +0,0 @@
-Bundle-SymbolicName: org.springframework.context
-Bundle-Name: Spring Context
-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=${spring.osgi.range};resolution:=optional,
- com.ibm.websphere.management;version="0";resolution:=optional
-Import-Template: 
- bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional,
- com.sun.net.*;version="0";resolution:=optional,
- edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional,
- groovy.*;version="[1.5.0, 2.0.0)";resolution:=optional,
- javax.annotation.*;version="0";resolution:=optional,
- javax.ejb.*;version="[2.1.0, 4.0.0)";resolution:=optional,
- javax.inject.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- javax.interceptor.*;version="[3.0.0, 4.0.0)";resolution:=optional,
- javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- javax.management.*;version="0";resolution:=optional,
- javax.naming.*;version="0";resolution:=optional,
- javax.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional,
- javax.rmi.*;version="0";resolution:=optional,
- javax.validation.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
- net.sf.cglib.*;version="[2.1.3, 3.0.0)";resolution:=optional,
- net.sf.ehcache.*;version="[1.3.0, 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=${aj.osgi.range};resolution:=optional,
- org.codehaus.groovy.*;version="[1.5.0, 2.0.0)";resolution:=optional,
- org.hibernate.validator.*;version="[4.0.0, 5.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=${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=${spring.osgi.range},
- org.xml.sax.*;version="0";resolution:=optional,
- org.w3c.dom.*;version="0";resolution:=optional
-Ignored-Existing-Headers: 
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-core/template.mf b/spring-core/template.mf
deleted file mode 100644
index d964ac37f4f..00000000000
--- a/spring-core/template.mf
+++ /dev/null
@@ -1,22 +0,0 @@
-Bundle-SymbolicName: org.springframework.core
-Bundle-Name: Spring Core
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Package: 
- org.eclipse.core.runtime;version="0";common="split";resolution:=optional,
- org.jboss.virtual;version="[2.1.0.GA, 3.0.0)";resolution:=optional,
- org.jboss.vfs;version="[3.0.0, 4.0.0)";resolution:=optional
-Import-Template: 
- javax.xml.*;version="0";resolution:=optional,
- org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.springframework.asm.*;version=${spring.osgi.range};resolution:=optional,
- org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional,
- joptsimple.*;version="[3.0.0, 4.0.0)";resolution:=optional,
- org.aspectj.*;version=${aj.osgi.range};resolution:=optional,
- org.xml.sax.*;version="0";resolution:=optional,
- org.w3c.dom.*;version="0";resolution:=optional
-Ignored-Existing-Headers: 
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-expression/template.mf b/spring-expression/template.mf
deleted file mode 100644
index 1b1b2d80b44..00000000000
--- a/spring-expression/template.mf
+++ /dev/null
@@ -1,8 +0,0 @@
-Bundle-SymbolicName: org.springframework.expression
-Bundle-Name: Spring Expression Language
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Template: 
- org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.springframework.core.*;version=${spring.osgi.range},
- org.springframework.util.*;version=${spring.osgi.range}
diff --git a/spring-instrument-tomcat/template.mf b/spring-instrument-tomcat/template.mf
deleted file mode 100644
index 42c9fc79f40..00000000000
--- a/spring-instrument-tomcat/template.mf
+++ /dev/null
@@ -1,6 +0,0 @@
-Bundle-SymbolicName: org.springframework.instrument.tomcat
-Bundle-Name: Spring Instrument Tomcat Weaver
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Template: 
- org.apache.catalina.*;version="[6.0.16, 7.0.0)"
diff --git a/spring-instrument/template.mf b/spring-instrument/template.mf
deleted file mode 100644
index 3c314d6aa6c..00000000000
--- a/spring-instrument/template.mf
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-SymbolicName: org.springframework.instrument
-Bundle-Name: Spring Instrument
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Premain-Class: org.springframework.instrument.InstrumentationSavingAgent
diff --git a/spring-jdbc/template.mf b/spring-jdbc/template.mf
deleted file mode 100644
index 4357e0cd6d6..00000000000
--- a/spring-jdbc/template.mf
+++ /dev/null
@@ -1,37 +0,0 @@
-Bundle-SymbolicName: org.springframework.jdbc
-Bundle-Name: Spring JDBC
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Package: 
- com.ibm.websphere.rsadapter;version="0";resolution:=optional,
- com.ibm.ws.rsadapter.jdbc;version="0";resolution:=optional,
- oracle.jdbc;version="0";resolution:=optional,
- oracle.sql;version="0";resolution:=optional,
- org.h2;version="[1.8.0, 2.0.0)";resolution:=optional,
- org.hsqldb;version="[1.0.0, 2.0.0)";resolution:=optional,
- org.jboss.resource.adapter.jdbc;version="0";resolution:=optional,
- weblogic.jdbc.extensions;version="0";resolution:=optional
-Import-Template: 
- com.mchange.v2.c3p0.*;version="[0.9.1, 2.0.0)";resolution:=optional,
- com.sun.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional,
- javax.naming.*;version="0";resolution:=optional,
- javax.sql.*;version="0",
- javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
- org.h2.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- 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=${spring.osgi.range},
- org.springframework.core.*;version=${spring.osgi.range},
- org.springframework.context.*;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,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-jms/template.mf b/spring-jms/template.mf
deleted file mode 100644
index 09cc73f63b1..00000000000
--- a/spring-jms/template.mf
+++ /dev/null
@@ -1,31 +0,0 @@
-Bundle-SymbolicName: org.springframework.jms
-Bundle-Name: Spring JMS
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Template: 
- javax.jms.*;version="[1.1.0, 2.0.0)",
- javax.naming.*;version="0";resolution:=optional,
- javax.resource.*;version="[1.5.0, 2.0.0)";resolution:=optional,
- javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
- javax.xml.*;version="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.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional,
- org.codehaus.jackson.*;version="[1.4.2, 2.0.0)";resolution:=optional,
- 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,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-orm/template.mf b/spring-orm/template.mf
deleted file mode 100644
index 42cc01e5b9b..00000000000
--- a/spring-orm/template.mf
+++ /dev/null
@@ -1,44 +0,0 @@
-Bundle-SymbolicName: org.springframework.orm
-Bundle-Name: Spring ORM
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Package: 
- com.ibatis.sqlmap.engine.transaction.external;version="[2.3.0, 3.0.0)";resolution:=optional,
- javax.persistence.criteria;version="[1.0.0, 3.0.0)";resolution:=optional,
- oracle.toplink.essentials.expressions;version="[2.0.0, 3.0.0)";resolution:=optional,
- org.eclipse.persistence.expressions;version="[1.0.0, 3.0.0)";resolution:=optional
-Import-Template: 
- com.ibatis.*;version="[2.3.0, 3.0.0)";resolution:=optional,
- javax.jdo.*;version="[2.0.0, 4.0.0)";resolution:=optional,
- javax.naming.*;version="0";resolution:=optional,
- javax.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional,
- javax.servlet.*;version="[2.4.0, 4.0.0)";resolution:=optional,
- javax.sql.*;version="0";resolution:=optional,
- javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
- oracle.toplink.essentials.*;version="[2.0.0, 3.0.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.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, 5.0.0)";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: 
- Bnd-LastModified,
- DynamicImport-Package,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-oxm/template.mf b/spring-oxm/template.mf
deleted file mode 100644
index 221f362d580..00000000000
--- a/spring-oxm/template.mf
+++ /dev/null
@@ -1,25 +0,0 @@
-Bundle-SymbolicName: org.springframework.oxm
-Bundle-Name: Spring Object/XML Mapping
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Template: 
- javax.activation.*;version="0";resolution:=optional,
- javax.xml.*;version="0",
- javax.xml.bind.*;version="0";resolution:=optional,
- com.thoughtworks.xstream.*;version="[1.2.2, 2.0.0)";resolution:=optional,
- org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- 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=${spring.osgi.range},
- org.springframework.context.*;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: 
- Bnd-LastModified,
- DynamicImport-Package,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-struts/template.mf b/spring-struts/template.mf
deleted file mode 100644
index 7349e81badf..00000000000
--- a/spring-struts/template.mf
+++ /dev/null
@@ -1,26 +0,0 @@
-Bundle-SymbolicName: org.springframework.web.struts
-Bundle-Name: Spring Web Struts
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Template: 
- antlr.*;version="[2.7.6, 3.0.0)";resolution:=optional,
- javax.servlet.*;version="[2.4.0, 3.0.0)",
- javax.sql.*;version="0",
- org.apache.commons.beanutils.*;version="[1.7.0, 2.0.0)",
- org.apache.commons.collections.*;version="[3.2.0, 4.0.0)",
- org.apache.commons.digester.*;version="[0.4.0, 1.0.0)",
- org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)",
- 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=${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,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-test/template.mf b/spring-test/template.mf
deleted file mode 100644
index 922576ace45..00000000000
--- a/spring-test/template.mf
+++ /dev/null
@@ -1,28 +0,0 @@
-Bundle-SymbolicName: org.springframework.test
-Bundle-Name: Spring Test
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Template: 
- javax.activation.*;version="0";resolution:=optional,
- javax.el.*;version="[1.0.0, 3.0.0)";resolution:=optional,
- javax.naming.*;version="0";resolution:=optional,
- javax.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional,
- javax.portlet.*;version="[2.0.0, 3.0.0)";resolution:=optional,
- javax.servlet;version="[2.4.0, 4.0.0)";resolution:=optional,
- javax.servlet.http;version="[2.4.0, 4.0.0)";resolution:=optional,
- javax.servlet.jsp.*;version="[2.0.0, 3.0.0)";resolution:=optional,
- javax.sql.*;version="0";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
- 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=${aj.osgi.range};resolution:=optional,
- org.junit.*;version="[4.5.0, 5.0.0)";resolution:=optional,
- org.springframework.*;version=${spring.osgi.range};resolution:=optional,
- org.testng.*;version="[5.12.1, 6.0.0)";resolution:=optional,
- org.w3c.dom.*;version="0";resolution:=optional
-Ignored-Existing-Headers: 
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-tx/template.mf b/spring-tx/template.mf
deleted file mode 100644
index 10692328dfd..00000000000
--- a/spring-tx/template.mf
+++ /dev/null
@@ -1,32 +0,0 @@
-Bundle-SymbolicName: org.springframework.transaction
-Bundle-Name: Spring Transaction
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Package: 
- com.ibm.websphere.uow;version="0";resolution:=optional,
- com.ibm.wsspi.uow;version="0";resolution:=optional,
- oracle.j2ee.transaction;version="0";resolution:=optional,
- org.jboss.resource.work;version="0";resolution:=optional,
- weblogic.transaction;version="0";resolution:=optional
-Import-Template: 
- javax.ejb.*;version="[3.0.0, 4.0.0)";resolution:=optional,
- javax.management.*;version="0";resolution:=optional,
- javax.naming.*;version="0";resolution:=optional,
- javax.resource.*;version="[1.5.0, 2.0.0)";resolution:=optional,
- 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=${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,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-web/template.mf b/spring-web/template.mf
deleted file mode 100644
index 095a5cfafc1..00000000000
--- a/spring-web/template.mf
+++ /dev/null
@@ -1,43 +0,0 @@
-Bundle-SymbolicName: org.springframework.web
-Bundle-Name: Spring Web
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Template: 
- com.caucho.*;version="[3.2.0, 5.0.0)";resolution:=optional,
- com.sun.syndication.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- org.codehaus.jackson.*;version="[1.3.0, 2.0.0)";resolution:=optional,
- com.sun.net.*;version="0";resolution:=optional,
- javax.activation.*;version="0";resolution:=optional,
- javax.el.*;version="[1.0.0, 3.0.0)";resolution:=optional,
- javax.faces.*;version="[1.1.0, 3.0.0)";resolution:=optional,
- javax.imageio.*;version="0";resolution:=optional,
- javax.jws.*;version="0";resolution:=optional,
- javax.portlet.*;version="[2.0.0, 3.0.0)";resolution:=optional,
- javax.servlet;version="[2.4.0, 4.0.0)",
- javax.servlet.http;version="[2.4.0, 4.0.0)",
- javax.servlet.annotation;version="[3.0.0, 4.0.0)";resolution:=optional,
- javax.servlet.jsp.*;version="[2.0.0, 3.0.0)";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
- org.aopalliance.*;version="[1.0.0, 2.0.0)",
- org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional, 
- 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.http.*;version="[4.1.0, 5.0.0)";resolution:=optional,
- org.apache.log4j.*;version="[1.2.15, 2.0.0)";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.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.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: 
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-webmvc-portlet/template.mf b/spring-webmvc-portlet/template.mf
deleted file mode 100644
index 25de73fd807..00000000000
--- a/spring-webmvc-portlet/template.mf
+++ /dev/null
@@ -1,26 +0,0 @@
-Bundle-SymbolicName: org.springframework.web.portlet
-Bundle-Name: Spring Web Portlet
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Template: 
- javax.portlet.*;version="[2.0.0, 3.0.0)",
- javax.servlet.*;version="[2.4.0, 4.0.0)",
- 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=${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.jndi.*;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,
- Import-Package,
- Export-Package,
- Tool
diff --git a/spring-webmvc/template.mf b/spring-webmvc/template.mf
deleted file mode 100644
index e5c88aafc94..00000000000
--- a/spring-webmvc/template.mf
+++ /dev/null
@@ -1,45 +0,0 @@
-Bundle-SymbolicName: org.springframework.web.servlet
-Bundle-Name: Spring Web Servlet
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Template: 
- com.sun.syndication.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- com.lowagie.text.*;version="[2.0.0, 3.0.0)";resolution:=optional,
- freemarker.*;version="[2.3.14, 3.0.0)";resolution:=optional,
- javax.activation.*;version="0";resolution:=optional,
- javax.el.*;version="[1.0.0, 3.0.0)";resolution:=optional,
- javax.sql.*;version="0";resolution:=optional,
- javax.servlet;version="[2.4.0, 4.0.0)",
- javax.servlet.http;version="[2.4.0, 4.0.0)",
- javax.servlet.jsp.*;version="[2.0.0, 3.0.0)";resolution:=optional,
- javax.servlet.jsp.jstl.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- javax.validation.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
- javax.xml.bind.*;version="0";resolution:=optional,
- jxl.*;version="[2.6.6, 3.0.0)";resolution:=optional,
- net.sf.jasperreports.*;version="[2.0.5, 4.0.0)";resolution:=optional,
- org.apache.commons.logging.*;version="[1.1.1, 2.0.0)";resolution:=optional,
- org.apache.poi.*;version="[3.0.2.FINAL, 4.0.0)";resolution:=optional,
- org.apache.tiles.*;version="[2.1.2, 3.0.0)";resolution:=optional,
- 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.3.0, 2.0.0)";resolution:=optional,
- 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: 
- Bnd-LastModified,
- Import-Package,
- Export-Package,
- Tool