diff --git a/build.properties b/build.properties
index e372a93b53..97985e951d 100644
--- a/build.properties
+++ b/build.properties
@@ -9,3 +9,4 @@ javadoc.exclude.package.names=org/springframework/integration/samples/**
 # dependency versions
 spring.version=3.0.0.RC1
 junit.version=4.7.0
+mockito.version=1.8.0
diff --git a/org.springframework.integration.file/.classpath b/org.springframework.integration.file/.classpath
index 1278e1ec59..19a7952e68 100644
--- a/org.springframework.integration.file/.classpath
+++ b/org.springframework.integration.file/.classpath
@@ -15,7 +15,7 @@
     <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-sources-3.0.0.RC1.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar" />
     <classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-1.6.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-sources-1.6.0.jar" />
+    <classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.0.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-sources-1.0.0.jar" />
     <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration" />
     <classpathentry kind="src" path="/org.springframework.integration.test" combineaccessrules="false" />
diff --git a/org.springframework.integration.file/ivy.xml b/org.springframework.integration.file/ivy.xml
index cd4828423d..8340c6c226 100644
--- a/org.springframework.integration.file/ivy.xml
+++ b/org.springframework.integration.file/ivy.xml
@@ -26,7 +26,7 @@
 		<dependency org="org.springframework" name="org.springframework.context" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="1.6.0" conf="test->runtime"/>
+		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="${mockito.version}" conf="test->runtime"/>
         <dependency org="org.springframework.integration" name="org.springframework.integration.test" rev="latest.integration" conf="test->runtime"/>                
 	</dependencies>
 
diff --git a/org.springframework.integration.http/.classpath b/org.springframework.integration.http/.classpath
index 24dc25f741..bdebd6c502 100644
--- a/org.springframework.integration.http/.classpath
+++ b/org.springframework.integration.http/.classpath
@@ -19,7 +19,7 @@
     <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-sources-3.0.0.RC1.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/3.0.0.RC1/org.springframework.web-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/3.0.0.RC1/org.springframework.web-sources-3.0.0.RC1.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.RC1/org.springframework.web.servlet-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.RC1/org.springframework.web.servlet-sources-3.0.0.RC1.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-1.6.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-sources-1.6.0.jar" />
+    <classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.0.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-sources-1.0.0.jar" />
     <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration" />
     <classpathentry kind="src" path="/org.springframework.integration.test" combineaccessrules="false" />
diff --git a/org.springframework.integration.http/ivy.xml b/org.springframework.integration.http/ivy.xml
index 8b632bcf73..63b0f24128 100644
--- a/org.springframework.integration.http/ivy.xml
+++ b/org.springframework.integration.http/ivy.xml
@@ -26,7 +26,7 @@
 		<dependency org="org.easymock" name="com.springsource.org.easymock.classextension" rev="2.3.0" 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.test" rev="${spring.version}" conf="test->runtime"/>
-		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="1.6.0" conf="test->runtime"/>		
+		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="${mockito.version}" conf="test->runtime"/>		
 		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="${spring.version}" conf="compile->runtime"/>
         <dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
         <dependency org="org.springframework.integration" name="org.springframework.integration.test" rev="latest.integration" conf="test->runtime"/>
diff --git a/org.springframework.integration.osgi/.classpath b/org.springframework.integration.osgi/.classpath
index b8a5737c27..d53a3f79df 100644
--- a/org.springframework.integration.osgi/.classpath
+++ b/org.springframework.integration.osgi/.classpath
@@ -11,7 +11,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-1.6.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-sources-1.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-sources-1.0.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.100.v20090629/org.eclipse.osgi-3.5.100.v20090629.jar" sourcepath="/IVY_CACHE/org.eclipse.osgi/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-sources-1.0.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
diff --git a/org.springframework.integration.osgi/ivy.xml b/org.springframework.integration.osgi/ivy.xml
index 72e9e72374..63a151148f 100644
--- a/org.springframework.integration.osgi/ivy.xml
+++ b/org.springframework.integration.osgi/ivy.xml
@@ -27,7 +27,7 @@
 		<dependency org="org.springframework" name="org.springframework.context" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
-		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="1.6.0" conf="test->runtime"/>
+		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="${mockito.version}" conf="test->runtime"/>
 		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.3.RELEASE" conf="compile->runtime"/>
 		<dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="3.5.0.v20090311-1300" conf="compile->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
diff --git a/org.springframework.integration.test/.classpath b/org.springframework.integration.test/.classpath
index 0bc1e5bb1f..fa5058f08d 100644
--- a/org.springframework.integration.test/.classpath
+++ b/org.springframework.integration.test/.classpath
@@ -18,7 +18,7 @@
     <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.RC1/org.springframework.expression-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.RC1/org.springframework.expression-sources-3.0.0.RC1.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.RC1/org.springframework.transaction-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.RC1/org.springframework.transaction-sources-3.0.0.RC1.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-sources-3.0.0.RC1.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-1.6.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-sources-1.6.0.jar" />
+    <classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.0.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-sources-1.0.0.jar" />
     <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration" />
     <classpathentry kind="output" path="target/classes" />
diff --git a/org.springframework.integration.test/ivy.xml b/org.springframework.integration.test/ivy.xml
index 2c0976af92..d59ab42c88 100644
--- a/org.springframework.integration.test/ivy.xml
+++ b/org.springframework.integration.test/ivy.xml
@@ -24,7 +24,7 @@
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="compile->runtime"/>
-		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="1.6.0" />
+		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="${mockito.version}" />
 	</dependencies>
 
 </ivy-module>
\ No newline at end of file
diff --git a/org.springframework.integration.udp/.classpath b/org.springframework.integration.udp/.classpath
index 1278e1ec59..19a7952e68 100644
--- a/org.springframework.integration.udp/.classpath
+++ b/org.springframework.integration.udp/.classpath
@@ -15,7 +15,7 @@
     <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-sources-3.0.0.RC1.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar" />
     <classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-1.6.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-sources-1.6.0.jar" />
+    <classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.0.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-sources-1.0.0.jar" />
     <classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration" />
     <classpathentry kind="src" path="/org.springframework.integration.test" combineaccessrules="false" />
diff --git a/org.springframework.integration.udp/ivy.xml b/org.springframework.integration.udp/ivy.xml
index cd4828423d..8340c6c226 100644
--- a/org.springframework.integration.udp/ivy.xml
+++ b/org.springframework.integration.udp/ivy.xml
@@ -26,7 +26,7 @@
 		<dependency org="org.springframework" name="org.springframework.context" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="1.6.0" conf="test->runtime"/>
+		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="${mockito.version}" conf="test->runtime"/>
         <dependency org="org.springframework.integration" name="org.springframework.integration.test" rev="latest.integration" conf="test->runtime"/>                
 	</dependencies>
 
diff --git a/org.springframework.integration.ws/.classpath b/org.springframework.integration.ws/.classpath
index 153bee8ff4..a0c05e6b65 100644
--- a/org.springframework.integration.ws/.classpath
+++ b/org.springframework.integration.ws/.classpath
@@ -19,7 +19,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.8.A/org.springframework.xml-1.5.8.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.8.A/org.springframework.xml-sources-1.5.8.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-3.0.0.RC1.jar" sourcepath="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-sources-3.0.0.RC1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-1.6.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-sources-1.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-sources-1.0.0.jar"/>	
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.adapter"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
diff --git a/org.springframework.integration.ws/ivy.xml b/org.springframework.integration.ws/ivy.xml
index 804cc8789a..df4ca3a259 100644
--- a/org.springframework.integration.ws/ivy.xml
+++ b/org.springframework.integration.ws/ivy.xml
@@ -30,7 +30,7 @@
 		</dependency>
 		<!-- test dependencies -->
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>	
-		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="1.6.0" conf="test->runtime"/>
+		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="${mockito.version}" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>				
 	</dependencies>
 
diff --git a/org.springframework.integration/.classpath b/org.springframework.integration/.classpath
index 3550217526..7fb9c0b1d6 100644
--- a/org.springframework.integration/.classpath
+++ b/org.springframework.integration/.classpath
@@ -20,7 +20,7 @@
     <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.RC1/org.springframework.expression-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.RC1/org.springframework.expression-sources-3.0.0.RC1.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.RC1/org.springframework.transaction-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.RC1/org.springframework.transaction-sources-3.0.0.RC1.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-sources-3.0.0.RC1.jar" />
-    <classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-1.6.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-sources-1.6.0.jar" />
+    <classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-1.8.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.8.0/com.springsource.org.mockito-sources-1.8.0.jar" />
     <classpathentry kind="var" path="IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-sources-1.0.0.jar" />
     <classpathentry kind="output" path="target/classes" />
 </classpath>
diff --git a/org.springframework.integration/ivy.xml b/org.springframework.integration/ivy.xml
index d0b8fdaa20..2ff16745c3 100644
--- a/org.springframework.integration/ivy.xml
+++ b/org.springframework.integration/ivy.xml
@@ -27,7 +27,7 @@
 		<dependency org="org.springframework" name="org.springframework.context" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
-		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="1.6.0" conf="test->runtime"/>
+		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="${mockito.version}" conf="test->runtime"/>
 		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="test->runtime"/>
         <dependency org="org.springframework.integration" name="org.springframework.integration.test" rev="latest.integration" conf="test->runtime"/>        
 	</dependencies>