diff --git a/build.properties b/build.properties
index 1432c7aa21..88a207f01a 100644
--- a/build.properties
+++ b/build.properties
@@ -7,5 +7,5 @@ ivy.cache.dir=${basedir}/../ivy-cache
 integration.repo.dir=${basedir}/../integration-repo
 javadoc.exclude.package.names=org/springframework/integration/samples/**
 # dependency versions
-spring.version=3.0.0.CI-352
+spring.version=3.0.0.M4
 junit.version=4.6.0
diff --git a/org.springframework.integration.adapter/.classpath b/org.springframework.integration.adapter/.classpath
index 98d5a22799..bc7aa81155 100644
--- a/org.springframework.integration.adapter/.classpath
+++ b/org.springframework.integration.adapter/.classpath
@@ -6,11 +6,11 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<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.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-sources-3.0.0.CI-352.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-sources-3.0.0.M4.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.integration.event/.classpath b/org.springframework.integration.event/.classpath
index 98d5a22799..bc7aa81155 100644
--- a/org.springframework.integration.event/.classpath
+++ b/org.springframework.integration.event/.classpath
@@ -6,11 +6,11 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<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.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-sources-3.0.0.CI-352.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-sources-3.0.0.M4.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.integration.file/.classpath b/org.springframework.integration.file/.classpath
index d226c65895..eed4cc27c8 100644
--- a/org.springframework.integration.file/.classpath
+++ b/org.springframework.integration.file/.classpath
@@ -6,12 +6,12 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<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.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-sources-3.0.0.CI-352.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-sources-3.0.0.M4.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.easymock/com.springsource.org.easymock.classextension/2.3.0/com.springsource.org.easymock.classextension-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock.classextension/2.3.0/com.springsource.org.easymock.classextension-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"/>
diff --git a/org.springframework.integration.http/.classpath b/org.springframework.integration.http/.classpath
index 01d4bf3082..8ca45a78db 100644
--- a/org.springframework.integration.http/.classpath
+++ b/org.springframework.integration.http/.classpath
@@ -10,14 +10,14 @@
 	<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.easymock/com.springsource.org.easymock.classextension/2.3.0/com.springsource.org.easymock.classextension-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/3.0.0.CI-352/org.springframework.web-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/3.0.0.CI-352/org.springframework.web-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.CI-352/org.springframework.web.servlet-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.CI-352/org.springframework.web.servlet-sources-3.0.0.CI-352.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/3.0.0.M4/org.springframework.web-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/3.0.0.M4/org.springframework.web-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.M4/org.springframework.web.servlet-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.M4/org.springframework.web.servlet-sources-3.0.0.M4.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.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"/>
diff --git a/org.springframework.integration.httpinvoker/.classpath b/org.springframework.integration.httpinvoker/.classpath
index 0f92755180..73a31ff374 100644
--- a/org.springframework.integration.httpinvoker/.classpath
+++ b/org.springframework.integration.httpinvoker/.classpath
@@ -8,14 +8,14 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
 	<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.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-352/org.springframework.aop-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-352/org.springframework.aop-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/3.0.0.CI-352/org.springframework.web-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/3.0.0.CI-352/org.springframework.web-sources-3.0.0.CI-352.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.M4/org.springframework.aop-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.M4/org.springframework.aop-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/3.0.0.M4/org.springframework.web-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/3.0.0.M4/org.springframework.web-sources-3.0.0.M4.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.adapter"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.springframework.integration.jms/.classpath b/org.springframework.integration.jms/.classpath
index c471ae0ee6..78a2091fce 100644
--- a/org.springframework.integration.jms/.classpath
+++ b/org.springframework.integration.jms/.classpath
@@ -7,14 +7,14 @@
 	<classpathentry kind="var" path="IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-1.1.0.jar" sourcepath="/IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-sources-1.1.0.jar"/>
 	<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.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.jms/3.0.0.CI-352/org.springframework.jms-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.jms/3.0.0.CI-352/org.springframework.jms-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-352/org.springframework.transaction-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-352/org.springframework.transaction-sources-3.0.0.CI-352.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.jms/3.0.0.M4/org.springframework.jms-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.jms/3.0.0.M4/org.springframework.jms-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.M4/org.springframework.transaction-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.M4/org.springframework.transaction-sources-3.0.0.M4.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.adapter"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.springframework.integration.mail/.classpath b/org.springframework.integration.mail/.classpath
index 260ba3e6e2..c46d7dbee7 100644
--- a/org.springframework.integration.mail/.classpath
+++ b/org.springframework.integration.mail/.classpath
@@ -8,13 +8,13 @@
 	<classpathentry kind="var" path="IVY_CACHE/javax.mail/com.springsource.javax.mail/1.4.1/com.springsource.javax.mail-1.4.1.jar" sourcepath="/IVY_CACHE/javax.mail/com.springsource.javax.mail/1.4.1/com.springsource.javax.mail-sources-1.4.1.jar"/>
 	<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.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.CI-352/org.springframework.context.support-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.CI-352/org.springframework.context.support-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-sources-3.0.0.CI-352.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.M4/org.springframework.context.support-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.M4/org.springframework.context.support-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-sources-3.0.0.M4.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.easymock/com.springsource.org.easymock.classextension/2.3.0/com.springsource.org.easymock.classextension-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock.classextension/2.3.0/com.springsource.org.easymock.classextension-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"/>
diff --git a/org.springframework.integration.rmi/.classpath b/org.springframework.integration.rmi/.classpath
index d476580e3c..0cbbbd1fa7 100644
--- a/org.springframework.integration.rmi/.classpath
+++ b/org.springframework.integration.rmi/.classpath
@@ -7,13 +7,13 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
 	<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.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-352/org.springframework.aop-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-352/org.springframework.aop-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-sources-3.0.0.CI-352.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.M4/org.springframework.aop-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.M4/org.springframework.aop-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-sources-3.0.0.M4.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.adapter"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.springframework.integration.security/.classpath b/org.springframework.integration.security/.classpath
index 6870d8daff..b8dcf79b84 100644
--- a/org.springframework.integration.security/.classpath
+++ b/org.springframework.integration.security/.classpath
@@ -8,14 +8,14 @@
 	<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.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-352/org.springframework.aop-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-352/org.springframework.aop-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-352/org.springframework.transaction-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-352/org.springframework.transaction-sources-3.0.0.CI-352.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.M4/org.springframework.aop-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.M4/org.springframework.aop-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.M4/org.springframework.transaction-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.M4/org.springframework.transaction-sources-3.0.0.M4.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.security/org.springframework.security.core/2.0.5.RELEASE/org.springframework.security.core-2.0.5.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework.security/org.springframework.security.core/2.0.5.RELEASE/org.springframework.security.core-sources-2.0.5.RELEASE.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.springframework.integration.stream/.classpath b/org.springframework.integration.stream/.classpath
index 00f1cf4a02..b9f2549b9d 100644
--- a/org.springframework.integration.stream/.classpath
+++ b/org.springframework.integration.stream/.classpath
@@ -6,12 +6,12 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<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.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-sources-3.0.0.CI-352.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-sources-3.0.0.M4.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.integration.test/.classpath b/org.springframework.integration.test/.classpath
index 63169d59e5..7a4f13232e 100644
--- a/org.springframework.integration.test/.classpath
+++ b/org.springframework.integration.test/.classpath
@@ -19,32 +19,32 @@
 		path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar"
 		sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar" />
 	<classpathentry kind="var"
-		path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-352/org.springframework.aop-3.0.0.CI-352.jar"
-		sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-352/org.springframework.aop-sources-3.0.0.CI-352.jar" />
+		path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.M4/org.springframework.aop-3.0.0.M4.jar"
+		sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.M4/org.springframework.aop-sources-3.0.0.M4.jar" />
 	<classpathentry kind="var"
-		path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-3.0.0.CI-352.jar"
-		sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-sources-3.0.0.CI-352.jar" />
+		path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-3.0.0.M4.jar"
+		sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-sources-3.0.0.M4.jar" />
 	<classpathentry kind="var"
-		path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-3.0.0.CI-352.jar"
-		sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-sources-3.0.0.CI-352.jar" />
+		path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-3.0.0.M4.jar"
+		sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-sources-3.0.0.M4.jar" />
 	<classpathentry kind="var"
-		path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-3.0.0.CI-352.jar"
-		sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-sources-3.0.0.CI-352.jar" />
+		path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-3.0.0.M4.jar"
+		sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-sources-3.0.0.M4.jar" />
 	<classpathentry kind="var"
-		path="IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.CI-352/org.springframework.context.support-3.0.0.CI-352.jar"
-		sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.CI-352/org.springframework.context.support-sources-3.0.0.CI-352.jar" />
+		path="IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.M4/org.springframework.context.support-3.0.0.M4.jar"
+		sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.M4/org.springframework.context.support-sources-3.0.0.M4.jar" />
 	<classpathentry kind="var"
-		path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-3.0.0.CI-352.jar"
-		sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-sources-3.0.0.CI-352.jar" />
+		path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-3.0.0.M4.jar"
+		sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-sources-3.0.0.M4.jar" />
 	<classpathentry kind="var"
-		path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-3.0.0.CI-352.jar"
-		sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-sources-3.0.0.CI-352.jar" />
+		path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-3.0.0.M4.jar"
+		sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-sources-3.0.0.M4.jar" />
 	<classpathentry kind="var"
-		path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-352/org.springframework.transaction-3.0.0.CI-352.jar"
-		sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-352/org.springframework.transaction-sources-3.0.0.CI-352.jar" />
+		path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.M4/org.springframework.transaction-3.0.0.M4.jar"
+		sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.M4/org.springframework.transaction-sources-3.0.0.M4.jar" />
 	<classpathentry kind="var"
-		path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-3.0.0.CI-352.jar"
-		sourcepath="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-sources-3.0.0.CI-352.jar" />
+		path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-3.0.0.M4.jar"
+		sourcepath="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-sources-3.0.0.M4.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" />
diff --git a/org.springframework.integration.ws/.classpath b/org.springframework.integration.ws/.classpath
index 94f3781e0c..fdbd7c0551 100644
--- a/org.springframework.integration.ws/.classpath
+++ b/org.springframework.integration.ws/.classpath
@@ -8,15 +8,15 @@
 	<classpathentry kind="var" path="IVY_CACHE/javax.xml.soap/com.springsource.javax.xml.soap/1.3.0/com.springsource.javax.xml.soap-1.3.0.jar" sourcepath="/IVY_CACHE/javax.xml.soap/com.springsource.javax.xml.soap/1.3.0/com.springsource.javax.xml.soap-sources-1.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.xml.stream/com.springsource.javax.xml.stream/1.0.1/com.springsource.javax.xml.stream-1.0.1.jar" sourcepath="/IVY_CACHE/javax.xml.stream/com.springsource.javax.xml.stream/1.0.1/com.springsource.javax.xml.stream-sources-1.0.1.jar"/>
 	<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.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-sources-3.0.0.CI-352.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-sources-3.0.0.M4.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.ws/1.5.7.A/org.springframework.ws-1.5.7.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.ws/1.5.7.A/org.springframework.ws-sources-1.5.7.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.7.A/org.springframework.oxm-1.5.7.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.7.A/org.springframework.oxm-sources-1.5.7.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.7.A/org.springframework.xml-1.5.7.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.7.A/org.springframework.xml-sources-1.5.7.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-3.0.0.CI-352.jar" sourcepath="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-sources-3.0.0.CI-352.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-3.0.0.M4.jar" sourcepath="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-sources-3.0.0.M4.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.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.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"/>	
diff --git a/org.springframework.integration.xml/.classpath b/org.springframework.integration.xml/.classpath
index 95fb2d16dd..a055afc4b4 100644
--- a/org.springframework.integration.xml/.classpath
+++ b/org.springframework.integration.xml/.classpath
@@ -10,15 +10,15 @@
 	<classpathentry kind="var" path="IVY_CACHE/javax.xml.stream/com.springsource.javax.xml.stream/1.0.1/com.springsource.javax.xml.stream-1.0.1.jar" sourcepath="IVY_CACHE/javax.xml.stream/com.springsource.javax.xml.stream/1.0.1/com.springsource.javax.xml.stream-sources-1.0.1.jar"/>
 	<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.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-sources-3.0.0.CI-352.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-sources-3.0.0.M4.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.7.A/org.springframework.oxm-1.5.7.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.7.A/org.springframework.oxm-sources-1.5.7.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.oxm.java5/1.5.7.A/org.springframework.oxm.java5-1.5.7.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.oxm.java5/1.5.7.A/org.springframework.oxm.java5-sources-1.5.7.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.7.A/org.springframework.xml-1.5.7.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.7.A/org.springframework.xml-sources-1.5.7.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-sources-3.0.0.CI-352.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-sources-3.0.0.M4.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-1.2.0.jar" sourcepath="/IVY_CACHE/org.custommonkey.xmlunit/com.springsource.org.custommonkey.xmlunit/1.2.0/com.springsource.org.custommonkey.xmlunit-sources-1.2.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.springframework.integration/.classpath b/org.springframework.integration/.classpath
index 1148c94d8b..2b52314112 100644
--- a/org.springframework.integration/.classpath
+++ b/org.springframework.integration/.classpath
@@ -10,15 +10,15 @@
 	<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.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-352/org.springframework.aop-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.CI-352/org.springframework.aop-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.CI-352/org.springframework.asm-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.CI-352/org.springframework.beans-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-352/org.springframework.context-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.CI-352/org.springframework.context.support-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.CI-352/org.springframework.context.support-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-352/org.springframework.core-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-352/org.springframework.expression-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-352/org.springframework.transaction-3.0.0.CI-352.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-352/org.springframework.transaction-sources-3.0.0.CI-352.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-3.0.0.CI-352.jar" sourcepath="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-352/org.springframework.test-sources-3.0.0.CI-352.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.M4/org.springframework.aop-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.M4/org.springframework.aop-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.M4/org.springframework.context.support-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.M4/org.springframework.context.support-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.M4/org.springframework.transaction-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.M4/org.springframework.transaction-sources-3.0.0.M4.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-3.0.0.M4.jar" sourcepath="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-sources-3.0.0.M4.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.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"/>