From 11f90023dc48b224f381a6b305f78f903a2876b0 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Thu, 9 Jun 2011 12:50:55 +0000
Subject: [PATCH] shortened build properties "org.junit.version" to
 "junit.version" and "org.testng.version" to "testng.version"; reverted SLF4J
 version back to 1.5.3 (for Hibernate 3.3.1 compatibility)

---
 org.springframework.integration-tests/ivy.xml | 2 +-
 org.springframework.test/build.xml            | 2 +-
 org.springframework.test/ivy.xml              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/org.springframework.integration-tests/ivy.xml b/org.springframework.integration-tests/ivy.xml
index e9d215f277..f4d035168e 100644
--- a/org.springframework.integration-tests/ivy.xml
+++ b/org.springframework.integration-tests/ivy.xml
@@ -98,7 +98,7 @@
 		<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="${junit.version}" conf="test->runtime"/>
 		<dependency org="org.hamcrest" name="com.springsource.org.hamcrest" rev="1.1.0" conf="test->runtime"/>
-		<dependency org="org.testng" name="com.springsource.org.testng" rev="${org.testng.version}" conf="test->compile"/>
+		<dependency org="org.testng" name="com.springsource.org.testng" rev="${testng.version}" conf="test->compile"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.test/build.xml b/org.springframework.test/build.xml
index 15152fc484..b738d1e93c 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 c233d13948..403e382061 100644
--- a/org.springframework.test/ivy.xml
+++ b/org.springframework.test/ivy.xml
@@ -46,7 +46,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>