From 99cfe931602ffc02c9fac65bcc42a8404f1c43cd Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Fri, 3 May 2013 10:06:24 +0200 Subject: [PATCH] DATACMNS-324 - Opened up template.mf version ranges for Spring 4. The generated OSGi manifest now declares version ranges that allow usage of Spring 4. --- template.mf | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/template.mf b/template.mf index 61de48b46..16b789492 100644 --- a/template.mf +++ b/template.mf @@ -11,20 +11,20 @@ Import-Template: javax.xml.bind.*;version="0";resolution:=optional, javax.xml.transform.*;version="0";resolution:=optional, org.codehaus.jackson.*;version="${jackson:[=.=.=,+1.0.0)}";resolution:=optional, - org.springframework.aop.*;version="${spring30:[=.=.=,+1.0.0)}";resolution:=optional, - org.springframework.beans.*;version="${spring30:[=.=.=,+1.0.0)}", - org.springframework.core.*;version="${spring30:[=.=.=,+1.0.0)}", - org.springframework.context.*;version="${spring30:[=.=.=,+1.0.0)}";resolution:=optional, - org.springframework.dao.*;version="${spring30:[=.=.=,+1.0.0)}";resolution:=optional, - org.springframework.expression.*;version="${spring30:[=.=.=,+1.0.0)}";resolution:=optional, - org.springframework.expression.spel.standard.*;version="${spring30:[=.=.=,+1.0.0)}";resolution:=optional, - org.springframework.expression.spel.support.*;version="${spring30:[=.=.=,+1.0.0)}";resolution:=optional, - org.springframework.hateoas.*;version="${springhateoas:[=.=.=,+1.0.0)}";resolution:=optional, - org.springframework.oxm.*;version="${spring30:[=.=.=,+1.0.0)}";resolution:=optional, - org.springframework.transaction.*;version="${spring30:[=.=.=,+1.0.0)}";resolution:=optional, - org.springframework.util.*;version="${spring30:[=.=.=,+1.0.0)}", - org.springframework.validation.*;version="${spring30:[=.=.=,+1.0.0)}";resolution:=optional, - org.springframework.web.*;version="${spring30:[=.=.=,+1.0.0)}";resolution:=optional, + org.springframework.aop.*;version="${spring30:[=.=.=,+1.1.0)}";resolution:=optional, + org.springframework.beans.*;version="${spring30:[=.=.=,+1.1.0)}", + org.springframework.core.*;version="${spring30:[=.=.=,+1.1.0)}", + org.springframework.context.*;version="${spring30:[=.=.=,+1.1.0)}";resolution:=optional, + org.springframework.dao.*;version="${spring30:[=.=.=,+1.1.0)}";resolution:=optional, + org.springframework.expression.*;version="${spring30:[=.=.=,+1.1.0)}";resolution:=optional, + org.springframework.expression.spel.standard.*;version="${spring30:[=.=.=,+1.1.0)}";resolution:=optional, + org.springframework.expression.spel.support.*;version="${spring30:[=.=.=,+1.1.0)}";resolution:=optional, + org.springframework.hateoas.*;version="${springhateoas:[=.=.=,+1.1.0)}";resolution:=optional, + org.springframework.oxm.*;version="${spring30:[=.=.=,+1.1.0)}";resolution:=optional, + org.springframework.transaction.*;version="${spring30:[=.=.=,+1.1.0)}";resolution:=optional, + org.springframework.util.*;version="${spring30:[=.=.=,+1.1.0)}", + org.springframework.validation.*;version="${spring30:[=.=.=,+1.1.0)}";resolution:=optional, + org.springframework.web.*;version="${spring30:[=.=.=,+1.1.0)}";resolution:=optional, org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}";resolution:=optional, org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",