Updated bundlor templates and introduced spring.version variable

acl/template.mf

@@ -11,11 +11,11 @@ Import-Template:
  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="[3.0.0, 3.1.0)";resolution:=optional, 
- org.springframework.dao.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.jdbc.core.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.transaction.support.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.util.*;version="[3.0.0, 3.1.0)";resolution:=optional, 
+ 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, 
  net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional,
  javax.sql.*;version="0";resolution:=optional 
  

cas/template.mf

@@ -12,10 +12,10 @@ Import-Template:
  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="[3.0.0, 3.1.0)",
- org.springframework.context.*;version="[3.0.0, 3.1.0)",
- org.springframework.dao;version="[3.0.0, 3.1.0)",
- org.springframework.util;version="[3.0.0, 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, 
  javax.servlet.*;version="0"
   

config/template.mf

@@ -8,17 +8,17 @@ Ignored-Existing-Headers:
  Export-Package
 Import-Template: 
  org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
- org.aspectj.*;version="[1.5.2, 1.7.0)";resolution:=optional, 
+ 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="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.1.0)",
- org.springframework.context.*;version="[3.0.0, 3.1.0)",
- org.springframework.core.*;version="[3.0.0, 3.1.0)",
- org.springframework.util.*;version="[3.0.0, 3.1.0)",
+ 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)",
  javax.servlet;version="0";resolution:=optional,
  javax.naming.directory;version="0";resolution:=optional,
  org.w3c.dom;version="0";resolution:=optional

core/template.mf

@@ -8,19 +8,18 @@ Ignored-Existing-Headers:
  Export-Package
 Import-Template: 
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
- org.aspectj.*;version="[1.5.2, 1.7.0)";resolution:=optional,
- org.apache.commons.codec.*;version="[1.3, 2.0)";resolution:=optional,
+ org.aspectj.*;version="[1.6.0, 1.7.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
- org.springframework.aop.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.1.0)",
- org.springframework.context.*;version="[3.0.0, 3.1.0)",
- org.springframework.core.*;version="[3.0.0, 3.1.0)",
- org.springframework.expression.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.remoting.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.dao.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.jdbc.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.transaction.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.util;version="[3.0.0, 3.1.0)",
+ 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.expression.*;version="[${spring.version}, 3.1.0)";resolution:=optional,
+ org.springframework.remoting.*;version="[${spring.version}, 3.1.0)";resolution:=optional,
+ org.springframework.dao.*;version="[${spring.version}, 3.1.0)";resolution:=optional,
+ 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, 
  javax.annotation.security.*;version="0";resolution:=optional,
  javax.crypto.*;version="0";resolution:=optional,

ldap/template.mf

@@ -15,10 +15,10 @@ Import-Template:
  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="[3.0.0, 3.1.0)",
- org.springframework.context.*;version="[3.0.0, 3.1.0)", 
- org.springframework.core.io.*;version="[3.0.0, 3.1.0)",
- org.springframework.dao.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.util.*;version="[3.0.0, 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)",
  javax.naming.*;version="0";resolution:=optional,
  netscape.ldap.ber.stream;version="[4.1, 5.0)";resolution:=optional

openid/template.mf

@@ -11,8 +11,8 @@ Import-Template:
  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="[3.0.0, 3.1.0)",
- org.springframework.util;version="[3.0.0, 3.1.0)",
+ org.springframework.beans.factory;version="[${spring.version}, 3.1.0)",
+ org.springframework.util;version="[${spring.version}, 3.1.0)",
  org.openid4java.*;version="[0.9.5, 1.0.0)",
  javax.servlet.*;version="0"
  

taglibs/template.mf

@@ -13,9 +13,9 @@ Import-Template:
  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="[3.0.0, 3.1.0)",
- org.springframework.context.*;version="[3.0.0, 3.1.0)",
- org.springframework.expression;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.web.context.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.web.util.*;version="[3.0.0, 3.1.0)",
+ 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)",
  javax.servlet.*;version="0"

web/template.mf

@@ -16,23 +16,22 @@ Ignored-Existing-Headers:
  Export-Package
 Import-Template:
  org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
- org.apache.commons.codec.*;version="[1.3, 2.0)";resolution:=optional,
  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="[3.0.0, 3.1.0)",
- org.springframework.context.*;version="[3.0.0, 3.1.0)",
- org.springframework.core;version="[3.0.0, 3.1.0)",
- org.springframework.core.io;version="[3.0.0, 3.1.0)",
- org.springframework.dao;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.expression;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.expression.spel.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.jdbc.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.mock.web;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.web.context.*;version="[3.0.0, 3.1.0)";resolution:=optional,
- org.springframework.web.filter.*;version="[3.0.0, 3.1.0)",
- org.springframework.util;version="[3.0.0, 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.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.w3c.dom;version="0";resolution:=optional,
  org.xml.sax;version="0";resolution:=optional,
  javax.servlet.*;version="0",