diff --git a/gradle.properties b/gradle.properties index aef7e8611..89d1dfffc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,12 +2,12 @@ slf4jVersion=1.7.5 junitVersion=4.11 jredisVersion=06052013 jedisVersion=2.4.1 -springVersion=3.2.10.RELEASE +springVersion=3.2.13.RELEASE log4jVersion=1.2.17 version=1.3.5.BUILD-SNAPSHOT srpVersion=0.7 jacksonVersion=1.8.8 -fasterXmlJacksonVersion=2.2.0 -fasterXmlJacksonDatabindVersion=2.2.2 +fasterXmlJacksonVersion=2.2.4 +fasterXmlJacksonDatabindVersion=2.2.4 lettuceVersion=2.3.3 mockitoVersion=1.9.5 diff --git a/template.mf b/template.mf index eebc423de..819f4dd3c 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="[3.2.13, 4.0.9)", + org.springframework.cache.*;version="[3.2.13, 4.0.9)", + org.springframework.context.*;version="[3.2.13, 4.0.9)", + org.springframework.core.*;version="[3.2.13, 4.0.9)", + org.springframework.dao.*;version="[3.2.13, 4.0.9)", + org.springframework.scheduling.*;resolution:="optional";version="[3.2.13, 4.0.9)", + org.springframework.scripting.*;resolution:="optional";version="[3.2.13, 4.0.9)", + org.springframework.util.*;version="[3.2.13, 4.0.9)", + org.springframework.aop.*;version="[3.2.13, 4.0.9)", + org.springframework.cglib.*;version="[3.2.13, 4.0.9)", + org.springframework.oxm.*;resolution:="optional";version="[3.2.13, 4.0.9)", + org.springframework.transaction.support.*;version="[3.2.13, 4.0.9)", 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", @@ -25,7 +25,7 @@ Import-Template: redis.clients.*;resolution:="optional";version="[2.1.0, 2.4.1)", org.apache.commons.pool2.*;resolution:="optional";version="[1.0, 2.2)", org.codehaus.jackson.*;resolution:="optional";version="[1.6, 2.0.0)", - com.fasterxml.jackson.*;resolution:="optional";version="[2.0.0, 3.0.0)", + com.fasterxml.jackson.*;resolution:="optional";version="[2.2.4, 3.0.0)", org.apache.commons.beanutils.*;resolution:="optional";version=1.8.5, redis.*;resolution:="optional";version="[0.2, 1.0)", com.google.common.*;resolution:="optional";version="[11.0.0, 20.0.0)",