From 9e44d587f847880aac93e74cdcdf8ee90181fb5a Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Tue, 20 Mar 2012 11:45:21 +0100 Subject: [PATCH] DATACMNS-136 - Made some Spring dependencies optional in template.mf. We have declared some Spring dependencies optional in the pom.xml file. I've changed the template.mf to declare the package dependencies of these artifacts as optional as well. --- spring-data-commons-core/template.mf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-data-commons-core/template.mf b/spring-data-commons-core/template.mf index 4b4acc13d..4bd42fbde 100644 --- a/spring-data-commons-core/template.mf +++ b/spring-data-commons-core/template.mf @@ -8,17 +8,17 @@ Import-Template: com.mysema.query.*;version="[2.2.0,3.0.0)";resolution:=optional, javax.enterprise.*;version="${cdi.version:[=.=.=,+1.0.0)}";resolution:=optional, javax.inject.*;version="[1.0.0,2.0.0)";resolution:=optional, - org.springframework.aop.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}", + org.springframework.aop.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}";resolution:=optional, org.springframework.beans.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}", org.springframework.core.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}", - org.springframework.context.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}", - org.springframework.dao.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}", + org.springframework.context.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}";resolution:=optional, + org.springframework.dao.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}";resolution:=optional, org.springframework.util.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}", - org.springframework.expression.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}", - org.springframework.expression.spel.standard.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}", - org.springframework.expression.spel.support.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}", - org.springframework.transaction.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}", - org.springframework.validation.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}", + org.springframework.expression.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}";resolution:=optional, + org.springframework.expression.spel.standard.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}";resolution:=optional, + org.springframework.expression.spel.support.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}";resolution:=optional, + org.springframework.transaction.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}";resolution:=optional, + org.springframework.validation.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}";resolution:=optional, org.springframework.web.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}";resolution:=optional, org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",