From e64866ae6a773907d14b80bb3f4e63e2dee17ecc Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Tue, 22 Dec 2009 01:10:04 +0000 Subject: [PATCH] Updated bundlor templates and introduced spring.version variable --- acl/template.mf | 10 +++++----- cas/template.mf | 8 ++++---- config/template.mf | 12 ++++++------ core/template.mf | 23 +++++++++++------------ ldap/template.mf | 10 +++++----- openid/template.mf | 4 ++-- taglibs/template.mf | 10 +++++----- web/template.mf | 25 ++++++++++++------------- 8 files changed, 50 insertions(+), 52 deletions(-) diff --git a/acl/template.mf b/acl/template.mf index 37e7026d69..77506b7898 100644 --- a/acl/template.mf +++ b/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 \ No newline at end of file diff --git a/cas/template.mf b/cas/template.mf index 8def6cf259..a8a1e200cf 100644 --- a/cas/template.mf +++ b/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" \ No newline at end of file diff --git a/config/template.mf b/config/template.mf index 5b67a4c189..7edb28ab41 100644 --- a/config/template.mf +++ b/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 diff --git a/core/template.mf b/core/template.mf index 9305dc0d00..e504f42548 100644 --- a/core/template.mf +++ b/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, diff --git a/ldap/template.mf b/ldap/template.mf index d9397e76d4..a0a16921a9 100644 --- a/ldap/template.mf +++ b/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 \ No newline at end of file diff --git a/openid/template.mf b/openid/template.mf index f0bcb91c9f..ae93d263b1 100644 --- a/openid/template.mf +++ b/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" \ No newline at end of file diff --git a/taglibs/template.mf b/taglibs/template.mf index dbf40d7623..e6b21478bd 100644 --- a/taglibs/template.mf +++ b/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" diff --git a/web/template.mf b/web/template.mf index 81319ad241..cc68ddc023 100644 --- a/web/template.mf +++ b/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",