From 9fac20a91e24b466b14de4469406045ca6fb63c1 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Sun, 24 Jul 2016 19:28:47 +0200
Subject: [PATCH] DATACMNS-886 - Fix version ranges for Spring Framework in
 template.mf.

---
 template.mf | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/template.mf b/template.mf
index be51625fa..fdbf5999a 100644
--- a/template.mf
+++ b/template.mf
@@ -14,23 +14,24 @@ Import-Template:
  javax.inject.*;version="[1.0.0,2.0.0)";resolution:=optional,
  javax.xml.bind.*;version="0";resolution:=optional,
  javax.xml.transform.*;version="0";resolution:=optional,
- org.springframework.aop.*;version="${spring:[=.=.=,+1.1.0)}";resolution:=optional,
- org.springframework.asm.*;version="${spring:[=.=.=,+1.1.0)}",
- org.springframework.beans.*;version="${spring:[=.=.=,+1.1.0)}",
- org.springframework.core.*;version="${spring:[=.=.=,+1.1.0)}",
- org.springframework.context.*;version="${spring:[=.=.=,+1.1.0)}";resolution:=optional,
- org.springframework.dao.*;version="${spring:[=.=.=,+1.1.0)}";resolution:=optional,
- org.springframework.expression.*;version="${spring:[=.=.=,+1.1.0)}";resolution:=optional,
- org.springframework.format.*;version="${spring:[=.=.=,+1.1.0)}";resolution:=optional,
- org.springframework.hateoas.*;version="${spring-hateoas:[=.=.=,+1.1.0)}";resolution:=optional,
- org.springframework.oxm.*;version="${spring:[=.=.=,+1.1.0)}";resolution:=optional,
- org.springframework.scheduling.*;version="${spring:[=.=.=,+1.1.0)}";resolution:=optional,
- org.springframework.transaction.*;version="${spring:[=.=.=,+1.1.0)}";resolution:=optional,
- org.springframework.util.*;version="${spring:[=.=.=,+1.1.0)}",
- org.springframework.validation.*;version="${spring:[=.=.=,+1.1.0)}";resolution:=optional,
- org.springframework.web.*;version="${spring:[=.=.=,+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.springframework.aop.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
+ org.springframework.asm.*;version="${spring:[=.=.=,+2.0.0)}",
+ org.springframework.beans.*;version="${spring:[=.=.=,+2.0.0)}",
+ org.springframework.core.*;version="${spring:[=.=.=,+2.0.0)}",
+ org.springframework.context.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
+ org.springframework.dao.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
+ org.springframework.expression.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
+ org.springframework.format.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
+ org.springframework.hateoas.*;version="${spring-hateoas:[=.=.=,+1.0.0)}";resolution:=optional,
+ org.springframework.http.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
+ org.springframework.oxm.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
+ org.springframework.scheduling.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
+ org.springframework.transaction.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
+ org.springframework.util.*;version="${spring:[=.=.=,+2.0.0)}",
+ org.springframework.validation.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
+ org.springframework.web.*;version="${spring:[=.=.=,+2.0.0)}";resolution:=optional,
  org.slf4j.*;version="[1.6.0,2.0.0)",
  org.threeten.bp.*;version="${threetenbp:[=.=.=,+1.0.0)}";resolution:=optional,
  javax.servlet.*;version="[2.5.0, 4.0.0)";resolution:=optional,