diff --git a/acl/template.mf b/acl/template.mf
index 77506b7898..d3abf3d0f2 100644
--- a/acl/template.mf
+++ b/acl/template.mf
@@ -3,19 +3,19 @@ Bundle-Name: Spring Security Acls
 Bundle-Vendor: SpringSource
 Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
-Ignored-Existing-Headers: 
+Ignored-Existing-Headers:
  Import-Package,
  Export-Package
-Import-Template: 
+Import-Template:
  org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
- org.springframework.security.core.*;version="[${version}, 3.1.0)",
- org.springframework.security.access.*;version="[${version}, 3.1.0)",
- org.springframework.security.util.*;version="[${version}, 3.1.0)",
- org.springframework.context.*;version="[${spring.version}, 3.1.0)";resolution:=optional, 
- org.springframework.dao.*;version="[${spring.version}, 3.1.0)";resolution:=optional,
- org.springframework.jdbc.core.*;version="[${spring.version}, 3.1.0)";resolution:=optional,
- org.springframework.transaction.support.*;version="[${spring.version}, 3.1.0)";resolution:=optional,
- org.springframework.util.*;version="[${spring.version}, 3.1.0)";resolution:=optional, 
+ org.springframework.security.core.*;version="[${version}, 3.2.0)",
+ org.springframework.security.access.*;version="[${version}, 3.2.0)",
+ org.springframework.security.util.*;version="[${version}, 3.2.0)",
+ org.springframework.context.*;version="[${spring.version}, 3.2.0)";resolution:=optional,
+ org.springframework.dao.*;version="[${spring.version}, 3.2.0)";resolution:=optional,
+ org.springframework.jdbc.core.*;version="[${spring.version}, 3.2.0)";resolution:=optional,
+ org.springframework.transaction.support.*;version="[${spring.version}, 3.2.0)";resolution:=optional,
+ org.springframework.util.*;version="[${spring.version}, 3.2.0)";resolution:=optional,
  net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional,
- javax.sql.*;version="0";resolution:=optional 
+ javax.sql.*;version="0";resolution:=optional
  
\ No newline at end of file
diff --git a/cas/template.mf b/cas/template.mf
index a8a1e200cf..e960f5dbcc 100644
--- a/cas/template.mf
+++ b/cas/template.mf
@@ -3,19 +3,19 @@ Bundle-Name: Spring Security CAS
 Bundle-Vendor: SpringSource
 Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
-Ignored-Existing-Headers: 
+Ignored-Existing-Headers:
  Import-Package,
  Export-Package
-Import-Template: 
+Import-Template:
  org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
- org.jasig.cas.client.*;version="[3.1.1,3.2)",
- org.springframework.security.core.*;version="[${version}, 3.1.0)",
- org.springframework.security.authentication.*;version="[${version}, 3.1.0)",
- org.springframework.security.web.*;version="[${version}, 3.1.0)", 
- org.springframework.beans.factory;version="[${spring.version}, 3.1.0)",
- org.springframework.context.*;version="[${spring.version}, 3.1.0)",
- org.springframework.dao;version="[${spring.version}, 3.1.0)",
- org.springframework.util;version="[${spring.version}, 3.1.0)", 
- net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional, 
+ org.jasig.cas.client.*;version="[3.1.1, 3.2.0)",
+ org.springframework.security.core.*;version="[${version}, 3.2.0)",
+ org.springframework.security.authentication.*;version="[${version}, 3.2.0)",
+ org.springframework.security.web.*;version="[${version}, 3.2.0)",
+ org.springframework.beans.factory;version="[${spring.version}, 3.2.0)",
+ org.springframework.context.*;version="[${spring.version}, 3.2.0)",
+ org.springframework.dao;version="[${spring.version}, 3.2.0)",
+ org.springframework.util;version="[${spring.version}, 3.2.0)",
+ net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional,
  javax.servlet.*;version="0"
   
\ No newline at end of file
diff --git a/config/template.mf b/config/template.mf
index 7edb28ab41..39eb8eb721 100644
--- a/config/template.mf
+++ b/config/template.mf
@@ -3,22 +3,22 @@ Bundle-Name: Spring Security Namespace Configuration
 Bundle-Vendor: SpringSource
 Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
-Ignored-Existing-Headers: 
+Ignored-Existing-Headers:
  Import-Package,
  Export-Package
-Import-Template: 
+Import-Template:
  org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
- org.aspectj.*;version="[1.6.0, 1.7.0)";resolution:=optional, 
- org.springframework.security.access.*;version="[${version}, 3.1.0)",
- org.springframework.security.authentication.*;version="[${version}, 3.1.0)",
- org.springframework.security.core.*;version="[${version}, 3.1.0)", 
- org.springframework.security.util;version="[${version}, 3.1.0)",
- org.springframework.security.web.*;version="[${version}, 3.1.0)";resolution:=optional,
- org.springframework.aop.*;version="[${spring.version}, 3.1.0)";resolution:=optional,
- org.springframework.beans.*;version="[${spring.version}, 3.1.0)",
- org.springframework.context.*;version="[${spring.version}, 3.1.0)",
- org.springframework.core.*;version="[${spring.version}, 3.1.0)",
- org.springframework.util.*;version="[${spring.version}, 3.1.0)",
+ org.aspectj.*;version="[1.6.0, 1.7.0)";resolution:=optional,
+ org.springframework.security.access.*;version="[${version}, 3.2.0)",
+ org.springframework.security.authentication.*;version="[${version}, 3.2.0)",
+ org.springframework.security.core.*;version="[${version}, 3.2.0)",
+ org.springframework.security.util;version="[${version}, 3.2.0)",
+ org.springframework.security.web.*;version="[${version}, 3.2.0)";resolution:=optional,
+ org.springframework.aop.*;version="[${spring.version}, 3.2.0)";resolution:=optional,
+ org.springframework.beans.*;version="[${spring.version}, 3.2.0)",
+ org.springframework.context.*;version="[${spring.version}, 3.2.0)",
+ org.springframework.core.*;version="[${spring.version}, 3.2.0)",
+ org.springframework.util.*;version="[${spring.version}, 3.2.0)",
  javax.servlet;version="0";resolution:=optional,
  javax.naming.directory;version="0";resolution:=optional,
  org.w3c.dom;version="0";resolution:=optional
diff --git a/core/template.mf b/core/template.mf
index e504f42548..67c58ea98f 100644
--- a/core/template.mf
+++ b/core/template.mf
@@ -3,10 +3,10 @@ Bundle-Name: Spring Security Core
 Bundle-Vendor: SpringSource
 Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
-Ignored-Existing-Headers: 
+Ignored-Existing-Headers:
  Import-Package,
  Export-Package
-Import-Template: 
+Import-Template:
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  org.aspectj.*;version="[1.6.0, 1.7.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
@@ -20,7 +20,7 @@ Import-Template:
  org.springframework.jdbc.*;version="[${spring.version}, 3.1.0)";resolution:=optional,
  org.springframework.transaction.*;version="[${spring.version}, 3.1.0)";resolution:=optional,
  org.springframework.util;version="[${spring.version}, 3.1.0)",
- net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional, 
+ net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional,
  javax.annotation.security.*;version="0";resolution:=optional,
  javax.crypto.*;version="0";resolution:=optional,
  javax.security.auth.*;version="0";resolution:=optional,
diff --git a/ldap/template.mf b/ldap/template.mf
index a0a16921a9..ac6ec159b6 100644
--- a/ldap/template.mf
+++ b/ldap/template.mf
@@ -3,22 +3,22 @@ Bundle-Name: Spring Security LDAP
 Bundle-Vendor: SpringSource
 Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
-Ignored-Existing-Headers: 
+Ignored-Existing-Headers:
  Import-Package,
  Export-Package
-Import-Template: 
+Import-Template:
  org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
  org.apache.directory.server.*;version="[1.5.5, 1.6)";resolution:=optional,
  org.apache.directory.shared.ldap.*;version="[0.9.15, 1.0)";resolution:=optional,
  org.springframework.ldap.*;version="[1.3.0,1.4.0)",
- org.springframework.security.core.*;version="[${version}, 3.1.0)",
- org.springframework.security.authentication.*;version="[${version}, 3.1.0)",
- org.springframework.security.provisioning.*;version="[${version}, 3.1.0)",
- org.springframework.security.util;version="[${version}, 3.1.0)", 
- org.springframework.beans.*;version="[${spring.version}, 3.1.0)",
- org.springframework.context.*;version="[${spring.version}, 3.1.0)", 
- org.springframework.core.io.*;version="[${spring.version}, 3.1.0)",
- org.springframework.dao.*;version="[${spring.version}, 3.1.0)";resolution:=optional,
- org.springframework.util.*;version="[${spring.version}, 3.1.0)",
+ org.springframework.security.core.*;version="[${version}, 3.2.0)",
+ org.springframework.security.authentication.*;version="[${version}, 3.2.0)",
+ org.springframework.security.provisioning.*;version="[${version}, 3.2.0)",
+ org.springframework.security.util;version="[${version}, 3.2.0)",
+ org.springframework.beans.*;version="[${spring.version}, 3.2.0)",
+ org.springframework.context.*;version="[${spring.version}, 3.2.0)",
+ org.springframework.core.io.*;version="[${spring.version}, 3.2.0)",
+ org.springframework.dao.*;version="[${spring.version}, 3.2.0)";resolution:=optional,
+ org.springframework.util.*;version="[${spring.version}, 3.2.0)",
  javax.naming.*;version="0";resolution:=optional,
  netscape.ldap.ber.stream;version="[4.1, 5.0)";resolution:=optional
\ No newline at end of file
diff --git a/openid/template.mf b/openid/template.mf
index ae93d263b1..2c1aa73ecd 100644
--- a/openid/template.mf
+++ b/openid/template.mf
@@ -3,16 +3,16 @@ Bundle-Name: Spring Security OpenID
 Bundle-Vendor: SpringSource
 Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
-Ignored-Existing-Headers: 
+Ignored-Existing-Headers:
  Import-Package,
  Export-Package
-Import-Template: 
+Import-Template:
  org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
- org.springframework.security.core.*;version="[${version}, 3.1.0)",
- org.springframework.security.authentication.*;version="[${version}, 3.1.0)",
- org.springframework.security.web.*;version="[${version}, 3.1.0)", 
- org.springframework.beans.factory;version="[${spring.version}, 3.1.0)",
- org.springframework.util;version="[${spring.version}, 3.1.0)",
+ org.springframework.security.core.*;version="[${version}, 3.2.0)",
+ org.springframework.security.authentication.*;version="[${version}, 3.2.0)",
+ org.springframework.security.web.*;version="[${version}, 3.2.0)",
+ org.springframework.beans.factory;version="[${spring.version}, 3.2.0)",
+ org.springframework.util;version="[${spring.version}, 3.2.0)",
  org.openid4java.*;version="[0.9.5, 1.0.0)",
  javax.servlet.*;version="0"
  
\ No newline at end of file
diff --git a/taglibs/template.mf b/taglibs/template.mf
index 556c8b03c1..2bcfd27270 100644
--- a/taglibs/template.mf
+++ b/taglibs/template.mf
@@ -8,14 +8,14 @@ Ignored-Existing-Headers:
  Export-Package
 Import-Template:
  org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
- org.springframework.security.core.*;version="[${version}, 3.1.0)",
- org.springframework.security.web.*;version="[${version}, 3.1.0)",
- org.springframework.security.access.*;version="[${version}, 3.1.0)",
- org.springframework.security.util;version="[${version}, 3.1.0)",
- org.springframework.security.acls.*;version="[${version}, 3.1.0)";resolution:=optional,
- org.springframework.beans.*;version="[${spring.version}, 3.1.0)",
- org.springframework.context.*;version="[${spring.version}, 3.1.0)",
- org.springframework.expression;version="[${spring.version}, 3.1.0)";resolution:=optional,
- org.springframework.web.context.*;version="[${spring.version}, 3.1.0)";resolution:=optional,
- org.springframework.web.util.*;version="[${spring.version}, 3.1.0)",
+ org.springframework.security.core.*;version="[${version}, 3.2.0)",
+ org.springframework.security.web.*;version="[${version}, 3.2.0)",
+ org.springframework.security.access.*;version="[${version}, 3.2.0)",
+ org.springframework.security.util;version="[${version}, 3.2.0)",
+ org.springframework.security.acls.*;version="[${version}, 3.2.0)";resolution:=optional,
+ org.springframework.beans.*;version="[${spring.version}, 3.2.0)",
+ org.springframework.context.*;version="[${spring.version}, 3.2.0)",
+ org.springframework.expression;version="[${spring.version}, 3.2.0)";resolution:=optional,
+ org.springframework.web.context.*;version="[${spring.version}, 3.2.0)";resolution:=optional,
+ org.springframework.web.util.*;version="[${spring.version}, 3.2.0)",
  javax.servlet.*;version="0"
diff --git a/web/template.mf b/web/template.mf
index cc68ddc023..0f7d71e5d7 100644
--- a/web/template.mf
+++ b/web/template.mf
@@ -16,22 +16,22 @@ Ignored-Existing-Headers:
  Export-Package
 Import-Template:
  org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
- org.springframework.security.core.*;version="[${version}, 3.1.0)",
- org.springframework.security.authentication.*;version="[${version}, 3.1.0)",
- org.springframework.security.access.*;version="[${version}, 3.1.0)",
- org.springframework.security.util;version="[${version}, 3.1.0)",
- org.springframework.beans.*;version="[${spring.version}, 3.1.0)",
- org.springframework.context.*;version="[${spring.version}, 3.1.0)",
- org.springframework.core;version="[${spring.version}, 3.1.0)",
- org.springframework.core.io;version="[${spring.version}, 3.1.0)",
- org.springframework.dao;version="[${spring.version}, 3.1.0)";resolution:=optional,
- org.springframework.expression;version="[${spring.version}, 3.1.0)";resolution:=optional,
- org.springframework.expression.spel.*;version="[${spring.version}, 3.1.0)";resolution:=optional,
- org.springframework.jdbc.*;version="[${spring.version}, 3.1.0)";resolution:=optional,
- org.springframework.mock.web;version="[${spring.version}, 3.1.0)";resolution:=optional,
- org.springframework.web.context.*;version="[${spring.version}, 3.1.0)";resolution:=optional,
- org.springframework.web.filter.*;version="[${spring.version}, 3.1.0)",
- org.springframework.util;version="[${spring.version}, 3.1.0)";resolution:=optional,
+ org.springframework.security.core.*;version="[${version}, 3.2.0)",
+ org.springframework.security.authentication.*;version="[${version}, 3.2.0)",
+ org.springframework.security.access.*;version="[${version}, 3.2.0)",
+ org.springframework.security.util;version="[${version}, 3.2.0)",
+ org.springframework.beans.*;version="[${spring.version}, 3.2.0)",
+ org.springframework.context.*;version="[${spring.version}, 3.2.0)",
+ org.springframework.core;version="[${spring.version}, 3.2.0)",
+ org.springframework.core.io;version="[${spring.version}, 3.2.0)",
+ org.springframework.dao;version="[${spring.version}, 3.2.0)";resolution:=optional,
+ org.springframework.expression;version="[${spring.version}, 3.2.0)";resolution:=optional,
+ org.springframework.expression.spel.*;version="[${spring.version}, 3.2.0)";resolution:=optional,
+ org.springframework.jdbc.*;version="[${spring.version}, 3.2.0)";resolution:=optional,
+ org.springframework.mock.web;version="[${spring.version}, 3.2.0)";resolution:=optional,
+ org.springframework.web.context.*;version="[${spring.version}, 3.2.0)";resolution:=optional,
+ org.springframework.web.filter.*;version="[${spring.version}, 3.2.0)",
+ org.springframework.util;version="[${spring.version}, 3.2.0)";resolution:=optional,
  org.w3c.dom;version="0";resolution:=optional,
  org.xml.sax;version="0";resolution:=optional,
  javax.servlet.*;version="0",