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)",