diff --git a/build.versions b/build.versions
index 0ebae99cbb3..70b64988206 100644
--- a/build.versions
+++ b/build.versions
@@ -1,5 +1,5 @@
 #common dependency versions
 aspectj.version=1.6.8.RELEASE
-slf4j.version=1.5.6
-org.testng.version=5.10.0
-org.junit.version=4.7.0
\ No newline at end of file
+slf4j.version=1.5.3
+junit.version=4.7.0
+testng.version=5.10.0
diff --git a/org.springframework.aop/ivy.xml b/org.springframework.aop/ivy.xml
index 8b39a7f50a4..4599db46883 100644
--- a/org.springframework.aop/ivy.xml
+++ b/org.springframework.aop/ivy.xml
@@ -37,7 +37,7 @@
 		<!-- test dependencies -->
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
 	</dependencies>
 
diff --git a/org.springframework.aspects/ivy.xml b/org.springframework.aspects/ivy.xml
index 90b144245cf..99d79c588cf 100644
--- a/org.springframework.aspects/ivy.xml
+++ b/org.springframework.aspects/ivy.xml
@@ -34,7 +34,7 @@
 		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="test->runtime"/>
 		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional, orm->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->compile"/>
 		<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="optional, test->compile"/>
 	</dependencies>
 
diff --git a/org.springframework.beans/ivy.xml b/org.springframework.beans/ivy.xml
index 0c85216032b..32a4cf725e8 100644
--- a/org.springframework.beans/ivy.xml
+++ b/org.springframework.beans/ivy.xml
@@ -30,7 +30,7 @@
 		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
 		<!-- test dependencies -->
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
 	</dependencies>
diff --git a/org.springframework.context.support/ivy.xml b/org.springframework.context.support/ivy.xml
index 48b50a0f7ef..189390a2d7f 100644
--- a/org.springframework.context.support/ivy.xml
+++ b/org.springframework.context.support/ivy.xml
@@ -51,7 +51,7 @@
 		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->runtime"/>
 		<dependency org="org.apache.poi" name="com.springsource.org.apache.poi" rev="3.0.2.FINAL" conf="test->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.context/ivy.xml b/org.springframework.context/ivy.xml
index 79f5e0114b9..76d3e71987c 100644
--- a/org.springframework.context/ivy.xml
+++ b/org.springframework.context/ivy.xml
@@ -65,7 +65,7 @@
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.dbcp" rev="1.2.2.osgi" conf="test->runtime"/>
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
 		<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
 	</dependencies>
 
diff --git a/org.springframework.core/ivy.xml b/org.springframework.core/ivy.xml
index 1045bec810a..d6c8db9c654 100644
--- a/org.springframework.core/ivy.xml
+++ b/org.springframework.core/ivy.xml
@@ -31,7 +31,7 @@
 		<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>
 		<!-- test dependencies -->
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="test->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.custommonkey.xmlunit" name="com.springsource.org.custommonkey.xmlunit" rev="1.2.0" conf="test->compile"/>
 		<dependency org="org.codehaus.woodstox" name="com.springsource.com.ctc.wstx" rev="3.2.7" conf="test->compile"/>
diff --git a/org.springframework.expression/ivy.xml b/org.springframework.expression/ivy.xml
index 379790bd2a0..501090d6ca3 100644
--- a/org.springframework.expression/ivy.xml
+++ b/org.springframework.expression/ivy.xml
@@ -27,7 +27,7 @@
 		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->runtime" />
 		<!-- test dependencies -->
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.integration-tests/ivy.xml b/org.springframework.integration-tests/ivy.xml
index fc5be79b019..a6a4f04ee7a 100644
--- a/org.springframework.integration-tests/ivy.xml
+++ b/org.springframework.integration-tests/ivy.xml
@@ -94,7 +94,7 @@
 		<dependency org="org.custommonkey.xmlunit" name="com.springsource.org.custommonkey.xmlunit" rev="1.2.0" conf="test->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock.classextension" rev="2.3.0" conf="test->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
 		<dependency org="org.testng" name="com.springsource.org.testng" rev="5.9.0" conf="test->compile"/>
 	</dependencies>
 
diff --git a/org.springframework.jdbc/ivy.xml b/org.springframework.jdbc/ivy.xml
index 3e209fb60ab..20ca8f3de27 100644
--- a/org.springframework.jdbc/ivy.xml
+++ b/org.springframework.jdbc/ivy.xml
@@ -37,7 +37,7 @@
 		<dependency org="com.h2database" name="com.springsource.org.h2" rev="1.0.71" conf="optional->compile"/>
 		<dependency org="org.apache.derby" name="com.springsource.org.apache.derby" rev="10.5.1000001.764942" conf="optional->compile"/>
 		<!-- test dependencies -->
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 	</dependencies>
 
diff --git a/org.springframework.jms/ivy.xml b/org.springframework.jms/ivy.xml
index eb18d9a94ed..c7fefd33d9c 100644
--- a/org.springframework.jms/ivy.xml
+++ b/org.springframework.jms/ivy.xml
@@ -34,7 +34,7 @@
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.5.3"
 					conf="optional, commons-pool->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->compile"/>
 		<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration"
 					conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
diff --git a/org.springframework.orm/ivy.xml b/org.springframework.orm/ivy.xml
index fba6aedc681..a20167ba391 100644
--- a/org.springframework.orm/ivy.xml
+++ b/org.springframework.orm/ivy.xml
@@ -60,8 +60,8 @@
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.5.3" conf="test->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
-		<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="1.5.3" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
+		<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.oxm/ivy.xml b/org.springframework.oxm/ivy.xml
index 04b1b530def..265c32a3a6f 100644
--- a/org.springframework.oxm/ivy.xml
+++ b/org.springframework.oxm/ivy.xml
@@ -50,7 +50,7 @@
 		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration"
 					conf="compile->compile"/>
 		<!-- test dependencies -->
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.codehaus.jettison" name="com.springsource.org.codehaus.jettison" rev="1.0.1"
 					conf="test->compile"/>
diff --git a/org.springframework.test/build.xml b/org.springframework.test/build.xml
index 15152fc484b..b738d1e93cd 100644
--- a/org.springframework.test/build.xml
+++ b/org.springframework.test/build.xml
@@ -32,7 +32,7 @@
 			</junit>
 
 			<ivy:cachepath resolveId="testng.classpath" pathid="testng.classpath" organisation="org.testng"
-					module="com.springsource.org.testng" revision="${org.testng.version}"
+					module="com.springsource.org.testng" revision="${testng.version}"
 					conf="runtime" type="jar" inline="true" log="download-only"/>
 			<taskdef name="testng" classpathref="testng.classpath" classname="org.testng.TestNGAntTask" />
 			<mkdir dir="${test-results.output.dir}/testng"/>
diff --git a/org.springframework.test/ivy.xml b/org.springframework.test/ivy.xml
index c0a1c5eb025..9d8e29c5284 100644
--- a/org.springframework.test/ivy.xml
+++ b/org.springframework.test/ivy.xml
@@ -36,7 +36,7 @@
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA" conf="test->compile"/>
 		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
 		<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="optional->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="optional->compile"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="optional->compile"/>
 		<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->compile"/>
 		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="optional->compile"/>
 		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional->compile"/>
@@ -47,7 +47,7 @@
 		<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="optional->compile"/>
 		<dependency org="org.springframework" name="org.springframework.web.portlet" rev="latest.integration" conf="optional->compile"/>
 		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="optional->compile"/>
-		<dependency org="org.testng" name="com.springsource.org.testng" rev="${org.testng.version}" conf="optional->compile"/>
+		<dependency org="org.testng" name="com.springsource.org.testng" rev="${testng.version}" conf="optional->compile"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.transaction/ivy.xml b/org.springframework.transaction/ivy.xml
index f7d56a0ccd6..16ec30cd3f9 100644
--- a/org.springframework.transaction/ivy.xml
+++ b/org.springframework.transaction/ivy.xml
@@ -36,7 +36,7 @@
 		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
 		<!-- test dependencies -->
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
 		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="test->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock.classextension" rev="2.3.0" conf="test->compile"/>
diff --git a/org.springframework.web.portlet/ivy.xml b/org.springframework.web.portlet/ivy.xml
index 9a7bf7940b2..5b22bf12adb 100644
--- a/org.springframework.web.portlet/ivy.xml
+++ b/org.springframework.web.portlet/ivy.xml
@@ -37,7 +37,7 @@
 		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.web.servlet/ivy.xml b/org.springframework.web.servlet/ivy.xml
index 026cc19bca5..9569d2647fc 100644
--- a/org.springframework.web.servlet/ivy.xml
+++ b/org.springframework.web.servlet/ivy.xml
@@ -81,7 +81,7 @@
 		<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration"
                     conf="compile->compile"/>
 		<!-- test dependencies -->
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="1.2.0"
                     conf="test->compile"/>		
@@ -103,7 +103,7 @@
 		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
 		<dependency org="javax.validation" name="com.springsource.javax.validation" rev="1.0.0.GA" conf="test->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.0.2.GA" conf="test->runtime"/>
-		<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="1.5.3" conf="test->runtime"/>
+		<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
 		<dependency org="org.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="test->runtime"/>
 	</dependencies>
 
diff --git a/org.springframework.web.struts/ivy.xml b/org.springframework.web.struts/ivy.xml
index 79c85ef2aca..78a6de187c2 100644
--- a/org.springframework.web.struts/ivy.xml
+++ b/org.springframework.web.struts/ivy.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
-        version="1.3">
-
-	<info organisation="org.springframework" module="${ant.project.name}">
-		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
-	</info>
-
-	<configurations>
-		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
-		<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
-		<conf name="tiles" extends="runtime" description="JARs neeeded to create beans for Tiles"/>
-	</configurations>
-
-	<publications>
-		<artifact name="${ant.project.name}"/>
-		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
-		<artifact name="license" type="license" ext="txt"/>
-		<artifact name="notice" type="notice" ext="txt"/>
-	</publications>
-
-	<dependencies>
-		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->compile"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1"
-                    conf="compile, commons-logging->compile"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.beanutils" rev="1.7.0"
-                    conf="compile->compile"/>
-		<dependency org="org.apache.struts" name="com.springsource.org.apache.struts" rev="1.2.9" conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
-                    conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
-                    conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration"
-                    conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration"
-                    conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration"
-                    conf="optional, tiles->compile"/>
-		<!-- test dependencies -->
- 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
-		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
-		<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration"
-                    conf="test->compile"/>
-		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp" rev="2.1.0"
-                    conf="test->compile"/>
-		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2"
-                    conf="test->compile"/>
-	</dependencies>
-
-</ivy-module>
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+        version="1.3">
+
+	<info organisation="org.springframework" module="${ant.project.name}">
+		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
+	</info>
+
+	<configurations>
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+		<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
+		<conf name="tiles" extends="runtime" description="JARs neeeded to create beans for Tiles"/>
+	</configurations>
+
+	<publications>
+		<artifact name="${ant.project.name}"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+		<artifact name="license" type="license" ext="txt"/>
+		<artifact name="notice" type="notice" ext="txt"/>
+	</publications>
+
+	<dependencies>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1"
+                    conf="compile, commons-logging->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.beanutils" rev="1.7.0"
+                    conf="compile->compile"/>
+		<dependency org="org.apache.struts" name="com.springsource.org.apache.struts" rev="1.2.9" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
+                    conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
+                    conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration"
+                    conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration"
+                    conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration"
+                    conf="optional, tiles->compile"/>
+		<!-- test dependencies -->
+ 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
+		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
+		<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration"
+                    conf="test->compile"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp" rev="2.1.0"
+                    conf="test->compile"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2"
+                    conf="test->compile"/>
+	</dependencies>
+
+</ivy-module>
diff --git a/org.springframework.web/ivy.xml b/org.springframework.web/ivy.xml
index d6fff677287..824007eb379 100644
--- a/org.springframework.web/ivy.xml
+++ b/org.springframework.web/ivy.xml
@@ -79,7 +79,7 @@
         <!-- test dependencies -->
         <dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2"
                     conf="test->runtime"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="c" conf="test->runtime"/>
 		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="test->compile"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
 		<dependency org="org.mortbay.jetty" name="com.springsource.org.mortbay.jetty.server" rev="6.1.9"
diff --git a/spring-framework.ipr b/spring-framework.ipr
index 93cc805c963..67fe1b7eed9 100644
--- a/spring-framework.ipr
+++ b/spring-framework.ipr
@@ -974,13 +974,13 @@
     </library>
     <library name="SLF4j">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/1.5.6/com.springsource.slf4j.api-1.5.6.jar!/" />
-        <root url="jar://$PROJECT_DIR$/ivy-cache/repository/org.slf4j/com.springsource.slf4j.jcl/1.5.6/com.springsource.slf4j.jcl-1.5.6.jar!/" />
+        <root url="jar://$PROJECT_DIR$/ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/1.5.3/com.springsource.slf4j.api-1.5.3.jar!/" />
+        <root url="jar://$PROJECT_DIR$/ivy-cache/repository/org.slf4j/com.springsource.slf4j.jcl/1.5.3/com.springsource.slf4j.jcl-1.5.3.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES>
-        <root url="jar://$PROJECT_DIR$/ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/1.5.6/com.springsource.slf4j.api-sources-1.5.6.jar!/" />
-        <root url="jar://$PROJECT_DIR$/ivy-cache/repository/org.slf4j/com.springsource.slf4j.jcl/1.5.6/com.springsource.slf4j.jcl-sources-1.5.6.jar!/" />
+        <root url="jar://$PROJECT_DIR$/ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/1.5.3/com.springsource.slf4j.api-sources-1.5.3.jar!/" />
+        <root url="jar://$PROJECT_DIR$/ivy-cache/repository/org.slf4j/com.springsource.slf4j.jcl/1.5.3/com.springsource.slf4j.jcl-sources-1.5.3.jar!/" />
       </SOURCES>
     </library>
   </component>