From abd28fe07a1cd03544c59812cb5a0c47730b179f Mon Sep 17 00:00:00 2001 From: dsyer Date: Tue, 7 Jul 2009 09:04:46 +0000 Subject: [PATCH] RESOLVED - issue BATCH-1321: Upgrade MANIFEST to allow Spring 3.0 to be used optionally http://jira.springframework.org/browse/BATCH-1321 --- archetypes/simple-cli/template.mf | 14 +++++++------- spring-batch-core/template.mf | 16 ++++++++-------- spring-batch-infrastructure/template.mf | 22 +++++++++++----------- spring-batch-test/template.mf | 24 ++++++++++++------------ 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/archetypes/simple-cli/template.mf b/archetypes/simple-cli/template.mf index 3a4d2fda2..755b9c899 100755 --- a/archetypes/simple-cli/template.mf +++ b/archetypes/simple-cli/template.mf @@ -6,11 +6,11 @@ Import-Template: org.apache.commons.logging.*;version="[1.1.0, 2.0.0)", org.apache.commons.io.*;version="[1.4.0, 2.0.0)";resolution:=optional, org.springframework.batch.*;version="[2.0.0, 3.0.0)", - org.springframework.beans.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.jdbc.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.util.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.dao.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.transaction.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.context.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.core.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.beans.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.jdbc.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.util.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.dao.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.transaction.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.context.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.core.*;version="[2.5.5, 4.0.0)";resolution:=optional, javax.sql.*;version="0";resolution:=optional diff --git a/spring-batch-core/template.mf b/spring-batch-core/template.mf index 0c954b6d8..d554f9c22 100644 --- a/spring-batch-core/template.mf +++ b/spring-batch-core/template.mf @@ -14,15 +14,15 @@ Import-Template: org.aspectj.*;version="[1.5.2,1.7.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.springframework.batch.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.aop.*;version="[2.5.5, 3.0.0)", - org.springframework.beans.*;version="[2.5.5, 3.0.0)", - org.springframework.context.*;version="[2.5.5, 3.0.0)", - org.springframework.core.*;version="[2.5.5, 3.0.0)", + org.springframework.aop.*;version="[2.5.5, 4.0.0)", + org.springframework.beans.*;version="[2.5.5, 4.0.0)", + org.springframework.context.*;version="[2.5.5, 4.0.0)", + org.springframework.core.*;version="[2.5.5, 4.0.0)", org.apache.commons.lang.*;version="[2.1,3.0)";resolution:=optional, - org.springframework.dao.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.jdbc.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.transaction.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.util.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.dao.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.jdbc.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.transaction.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.util.*;version="[2.5.5, 4.0.0)";resolution:=optional, org.springframework.osgi.*;version="[1.1.0, 2.0.0)";resolution:=optional, org.osgi.framework;version="0";resolution:=optional, org.w3c.dom;version="0";resolution:=optional, diff --git a/spring-batch-infrastructure/template.mf b/spring-batch-infrastructure/template.mf index 7e2c8275a..1b72d800e 100644 --- a/spring-batch-infrastructure/template.mf +++ b/spring-batch-infrastructure/template.mf @@ -16,20 +16,20 @@ Import-Template: org.apache.commons.lang.*;version="[2.1,3.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.1.0, 2.0.0)", com.ibatis.sqlmap.*;version="[2.3.0,3.0.0)";resolution:=optional, - org.springframework.aop.*;version="[2.5.5, 3.0.0)", org.springframework.batch.*;version="[2.0.0, 3.0.0)", - org.springframework.beans.*;version="[2.5.5, 3.0.0)", - org.springframework.context.*;version="[2.5.5, 3.0.0)", - org.springframework.core.*;version="[2.5.5, 3.0.0)", - org.springframework.dao.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.jdbc.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.jms.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.orm.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.aop.*;version="[2.5.5, 4.0.0)", + org.springframework.beans.*;version="[2.5.5, 4.0.0)", + org.springframework.context.*;version="[2.5.5, 4.0.0)", + org.springframework.core.*;version="[2.5.5, 4.0.0)", + org.springframework.dao.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.jdbc.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.jms.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.orm.*;version="[2.5.5, 4.0.0)";resolution:=optional, org.springframework.oxm.*;version="[1.5.5, 2.0.0)";resolution:=optional, org.springframework.xml.*;version="[1.5.5, 2.0.0)";resolution:=optional, - org.springframework.validation.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.transaction.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.util.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.validation.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.transaction.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.util.*;version="[2.5.5, 4.0.0)";resolution:=optional, org.springframework.osgi.*;version="[1.1.0, 2.0.0)";resolution:=optional, javax.sql.*;version="0";resolution:=optional, javax.jms;version="0";resolution:=optional, diff --git a/spring-batch-test/template.mf b/spring-batch-test/template.mf index 3c4896b53..85392fcf2 100644 --- a/spring-batch-test/template.mf +++ b/spring-batch-test/template.mf @@ -19,18 +19,18 @@ Import-Template: junit.framework;version="[4.4.0,5.0.0)";resolution:=optional, org.hibernate.*;version="[3.2.5.ga, 3.3.0.ga)";resolution:=optional, org.springframework.batch.*;version="[2.0.0, 3.0.0)", - org.springframework.aop.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.aop.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.beans.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.core.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.dao.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.context.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.jdbc.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.jms.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.orm.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.transaction.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.util.*;version="[2.5.5, 3.0.0)";resolution:=optional, - org.springframework.validation.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.aop.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.aop.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.beans.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.core.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.dao.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.context.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.jdbc.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.jms.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.orm.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.transaction.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.util.*;version="[2.5.5, 4.0.0)";resolution:=optional, + org.springframework.validation.*;version="[2.5.5, 4.0.0)";resolution:=optional, org.springframework.oxm.*;version="[1.5.0, 2.0.0)";resolution:=optional, org.springframework.xml.*;version="[1.5.0, 2.0.0)";resolution:=optional, javax.sql.*;version="0",