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

@@ -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>

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"/>

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>