From 3f2fbd396c0ea11ffceefdb9481cabda7dbad3b3 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Wed, 9 Jul 2014 21:05:36 +0200 Subject: [PATCH] DATAREDIS-321 - Adapt to Spring 4 upgrade. Set minimum version dependency to 4.0.6.RELEASE. --- gradle.properties | 2 +- template.mf | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5d437e7db..0ca42d1bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ slf4jVersion=1.7.5 junitVersion=4.11 jredisVersion=06052013 jedisVersion=2.5.1 -springVersion=3.2.9.RELEASE +springVersion=4.0.6.RELEASE log4jVersion=1.2.17 version=1.4.0.BUILD-SNAPSHOT srpVersion=0.7 diff --git a/template.mf b/template.mf index eebc423de..caa596bba 100644 --- a/template.mf +++ b/template.mf @@ -5,18 +5,18 @@ Bundle-ManifestVersion: 2 Import-Package: sun.reflect;version="0";resolution:=optional Import-Template: - org.springframework.beans.*;version="[3.2.9, 4.0.5)", - org.springframework.cache.*;version="[3.2.9, 4.0.5)", - org.springframework.context.*;version="[3.2.9, 4.0.5)", - org.springframework.core.*;version="[3.2.9, 4.0.5)", - org.springframework.dao.*;version="[3.2.9, 4.0.5)", - org.springframework.scheduling.*;resolution:="optional";version="[3.2.9, 4.0.5)", - org.springframework.scripting.*;resolution:="optional";version="[3.2.9, 4.0.5)", - org.springframework.util.*;version="[3.2.9, 4.0.5)", - org.springframework.aop.*;version="[3.2.9, 4.0.5)", - org.springframework.cglib.*;version="[3.2.9, 4.0.5)", - org.springframework.oxm.*;resolution:="optional";version="[3.2.9, 4.0.5)", - org.springframework.transaction.support.*;version="[3.2.9, 4.0.5)", + org.springframework.beans.*;version="[4.0.6, 4.0.6)", + org.springframework.cache.*;version="[4.0.6, 4.0.6)", + org.springframework.context.*;version="[4.0.6, 4.0.6)", + org.springframework.core.*;version="[4.0.6, 4.0.6)", + org.springframework.dao.*;version="[4.0.6, 4.0.6)", + org.springframework.scheduling.*;resolution:="optional";version="[4.0.6, 4.0.6)", + org.springframework.scripting.*;resolution:="optional";version="[4.0.6, 4.0.6)", + org.springframework.util.*;version="[4.0.6, 4.0.6)", + org.springframework.aop.*;version="[4.0.6, 4.0.6)", + org.springframework.cglib.*;version="[4.0.6, 4.0.6)", + org.springframework.oxm.*;resolution:="optional";version="[4.0.6, 4.0.6)", + org.springframework.transaction.support.*;version="[4.0.6, 4.0.6)", org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.w3c.dom.*;version="0",