DATAREDIS-250 - Upgrade to latest Spring Framework 3.2.x release.

Updated dependencies for slf4j, junit and mockito to match the Spring Framework dependencies.
This commit is contained in:
Thomas Darimont
2014-01-15 11:49:54 +01:00
committed by Christoph Strobl
parent 3d008125e7
commit 47ef20fec5
2 changed files with 14 additions and 14 deletions

View File

@@ -1,11 +1,11 @@
slf4jVersion=1.6.6
junitVersion=4.8.1
slf4jVersion=1.7.5
junitVersion=4.10
jredisVersion=06052013
jedisVersion=2.1.0
springVersion=3.1.4.RELEASE
springVersion=3.2.6.RELEASE
log4jVersion=1.2.17
version=1.2.0.BUILD-SNAPSHOT
srpVersion=0.7
jacksonVersion=1.8.8
lettuceVersion=2.3.3
mockitoVersion=1.8.5
mockitoVersion=1.9.5

View File

@@ -5,16 +5,16 @@ Bundle-ManifestVersion: 2
Import-Package:
sun.reflect;version="0";resolution:=optional
Import-Template:
org.springframework.beans.*;version="[3.1.0, 4.0.0)",
org.springframework.cache.*;version="[3.1.0, 4.0.0)",
org.springframework.context.*;version="[3.1.0, 4.0.0)",
org.springframework.core.*;version="[3.1.0, 4.0.0)",
org.springframework.dao.*;version="[3.1.0, 4.0.0)",
org.springframework.scheduling.*;resolution:="optional";version="[3.1.0, 4.0.0)",
org.springframework.scripting.*;resolution:="optional";version="[3.1.0, 4.0.0)",
org.springframework.util.*;version="[3.1.0, 4.0.0)",
org.springframework.oxm.*;resolution:="optional";version="[3.1.0, 4.0.0)",
org.springframework.transaction.support.*;version="[3.1.0, 4.0.0)",
org.springframework.beans.*;version="[3.2.6, 4.0.0)",
org.springframework.cache.*;version="[3.2.6, 4.0.0)",
org.springframework.context.*;version="[3.2.6, 4.0.0)",
org.springframework.core.*;version="[3.2.6, 4.0.0)",
org.springframework.dao.*;version="[3.2.6, 4.0.0)",
org.springframework.scheduling.*;resolution:="optional";version="[3.2.6, 4.0.0)",
org.springframework.scripting.*;resolution:="optional";version="[3.2.6, 4.0.0)",
org.springframework.util.*;version="[3.2.6, 4.0.0)",
org.springframework.oxm.*;resolution:="optional";version="[3.2.6, 4.0.0)",
org.springframework.transaction.support.*;version="[3.2.6, 4.0.0)",
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",