diff --git a/org.springframework.integration.adapter/template.mf b/org.springframework.integration.adapter/template.mf
index 566a7a287d..f2a68a20ac 100644
--- a/org.springframework.integration.adapter/template.mf
+++ b/org.springframework.integration.adapter/template.mf
@@ -4,8 +4,8 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.springframework.beans.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.remoting;version="[2.5.6.A, 3.1.0)",
- org.springframework.util;version="[2.5.6.A, 3.1.0)",
- org.springframework.integration.*;version="[1.0.3, 1.0.4)",
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.remoting;version="[3.0.0, 4.0.0)",
+ org.springframework.util;version="[3.0.0, 4.0.0)",
+ org.springframework.integration.*;version="[2.0.0, 2.0.1)",
  org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.event/template.mf b/org.springframework.integration.event/template.mf
index 741859e5c6..3190459350 100644
--- a/org.springframework.integration.event/template.mf
+++ b/org.springframework.integration.event/template.mf
@@ -3,7 +3,7 @@ Bundle-Name: Spring Integration ApplicationEvent Support
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.integration.*;version="[1.0.3, 1.0.4)",
- org.springframework.context;version="[2.5.6.A, 3.1.0)",
- org.springframework.util;version="[2.5.6.A, 3.1.0)",
+ org.springframework.integration.*;version="[2.0.0, 2.0.1)",
+ org.springframework.context;version="[3.0.0, 4.0.0)",
+ org.springframework.util;version="[3.0.0, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)"
diff --git a/org.springframework.integration.file/template.mf b/org.springframework.integration.file/template.mf
index 314566166d..6042cd5926 100644
--- a/org.springframework.integration.file/template.mf
+++ b/org.springframework.integration.file/template.mf
@@ -4,9 +4,9 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.springframework.integration.*;version="[1.0.3, 1.0.4)",
- org.springframework.beans.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.context;version="[2.5.6.A, 3.1.0)",
- org.springframework.core.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.util;version="[2.5.6.A, 3.1.0)",
+ org.springframework.integration.*;version="[2.0.0, 2.0.1)",
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.context;version="[3.0.0, 4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util;version="[3.0.0, 4.0.0)",
  org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.http/template.mf b/org.springframework.integration.http/template.mf
index 7d0523531e..4334d684d6 100644
--- a/org.springframework.integration.http/template.mf
+++ b/org.springframework.integration.http/template.mf
@@ -3,12 +3,12 @@ Bundle-Name: Spring Integration HTTP Support
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.integration.*;version="[1.0.3, 1.0.4)",
- org.springframework.beans.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.context.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.core.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.util;version="[2.5.6.A, 3.1.0)",
- org.springframework.web.*;version="[2.5.6.A, 3.1.0)";resolution:=optional,
+ org.springframework.integration.*;version="[2.0.0, 2.0.1)",
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.context.*;version="[3.0.0, 4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util;version="[3.0.0, 4.0.0)",
+ org.springframework.web.*;version="[3.0.0, 4.0.0)";resolution:=optional,
  org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional,
diff --git a/org.springframework.integration.httpinvoker/template.mf b/org.springframework.integration.httpinvoker/template.mf
index 6db19b6655..df3f62d4fb 100644
--- a/org.springframework.integration.httpinvoker/template.mf
+++ b/org.springframework.integration.httpinvoker/template.mf
@@ -3,13 +3,13 @@ Bundle-Name: Spring Integration HttpInvoker Support
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.integration.*;version="[1.0.3, 1.0.4)",
- org.springframework.beans.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.context;version="[2.5.6.A, 3.1.0)",
- org.springframework.core.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.remoting.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.util;version="[2.5.6.A, 3.1.0)",
- org.springframework.web;version="[2.5.6.A, 3.1.0)";resolution:=optional,
+ org.springframework.integration.*;version="[2.0.0, 2.0.1)",
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.context;version="[3.0.0, 4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 4.0.0)",
+ org.springframework.remoting.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util;version="[3.0.0, 4.0.0)",
+ org.springframework.web;version="[3.0.0, 4.0.0)";resolution:=optional,
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional,
  org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.jms/template.mf b/org.springframework.integration.jms/template.mf
index fcfe170412..feb66b3d9a 100644
--- a/org.springframework.integration.jms/template.mf
+++ b/org.springframework.integration.jms/template.mf
@@ -3,13 +3,13 @@ Bundle-Name: Spring Integration JMS Support
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.integration.*;version="[1.0.3, 1.0.4)",
- org.springframework.beans.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.context;version="[2.5.6.A, 3.1.0)",
- org.springframework.core.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.jms.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.transaction.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.util;version="[2.5.6.A, 3.1.0)",
+ org.springframework.integration.*;version="[2.0.0, 2.0.1)",
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.context;version="[3.0.0, 4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 4.0.0)",
+ org.springframework.jms.*;version="[3.0.0, 4.0.0)",
+ org.springframework.transaction.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util;version="[3.0.0, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  javax.jms;version="[1.1.0, 2.0.0)";resolution:=optional,
  org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.mail/template.mf b/org.springframework.integration.mail/template.mf
index 5e4580afb2..81e168323c 100644
--- a/org.springframework.integration.mail/template.mf
+++ b/org.springframework.integration.mail/template.mf
@@ -3,12 +3,12 @@ Bundle-Name: Spring Integration Mail Support
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.integration.*;version="[1.0.3, 1.0.4)",
- org.springframework.beans.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.context;version="[2.5.6.A, 3.1.0)",
- org.springframework.core.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.mail.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.util.*;version="[2.5.6.A, 3.1.0)",
+ org.springframework.integration.*;version="[2.0.0, 2.0.1)",
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.context;version="[3.0.0, 4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 4.0.0)",
+ org.springframework.mail.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util.*;version="[3.0.0, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  javax.mail.*;version="[1.4.0, 2.0.0)",
  com.sun.mail.imap.*;version="[1.4.0, 2.0.0)";resolution:=optional,
diff --git a/org.springframework.integration.rmi/template.mf b/org.springframework.integration.rmi/template.mf
index a0c9572502..34d5cc4df5 100644
--- a/org.springframework.integration.rmi/template.mf
+++ b/org.springframework.integration.rmi/template.mf
@@ -3,11 +3,11 @@ Bundle-Name: Spring Integration RMI Support
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.integration.*;version="[1.0.3, 1.0.4)",
- org.springframework.beans.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.context;version="[2.5.6.A, 3.1.0)",
- org.springframework.core.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.remoting.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.util;version="[2.5.6.A, 3.1.0)",
+ org.springframework.integration.*;version="[2.0.0, 2.0.1)",
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.context;version="[3.0.0, 4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 4.0.0)",
+ org.springframework.remoting.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util;version="[3.0.0, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.security/.classpath b/org.springframework.integration.security/.classpath
index b01aebdb4c..7642cef23a 100644
--- a/org.springframework.integration.security/.classpath
+++ b/org.springframework.integration.security/.classpath
@@ -16,7 +16,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-348/org.springframework.expression-3.0.0.CI-348.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-348/org.springframework.expression-sources-3.0.0.CI-348.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-348/org.springframework.test-3.0.0.CI-348.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-348/org.springframework.test-sources-3.0.0.CI-348.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-348/org.springframework.transaction-3.0.0.CI-348.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.CI-348/org.springframework.transaction-sources-3.0.0.CI-348.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework.security/org.springframework.security/2.0.4.A/org.springframework.security-2.0.4.A.jar" sourcepath="/IVY_CACHE/org.springframework.security/org.springframework.security/2.0.4.A/org.springframework.security-sources-2.0.4.A.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.springframework.security/org.springframework.security/2.0.5.RELEASE/org.springframework.security-2.0.5.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework.security/org.springframework.security/2.0.5.RELEASE/org.springframework.security-sources-2.0.5.RELEASE.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.integration.security/ivy.xml b/org.springframework.integration.security/ivy.xml
index 48127edb95..a1872564dd 100644
--- a/org.springframework.integration.security/ivy.xml
+++ b/org.springframework.integration.security/ivy.xml
@@ -26,7 +26,7 @@
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="${spring.version}" conf="test->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework.security" name="org.springframework.security" rev="2.0.4.A" conf="compile->runtime">
+		<dependency org="org.springframework.security" name="org.springframework.security.core" rev="2.0.5.RELEASE" conf="compile->runtime">
 			<exclude org="org.springframework"/>
 		</dependency>
 	</dependencies>
diff --git a/org.springframework.integration.security/template.mf b/org.springframework.integration.security/template.mf
index b01e96b1c4..ac2fe30ddb 100644
--- a/org.springframework.integration.security/template.mf
+++ b/org.springframework.integration.security/template.mf
@@ -5,10 +5,10 @@ Bundle-ManifestVersion: 2
 Import-Template: 
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.springframework.aop.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.beans.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.core;version="[2.5.6.A, 3.1.0)",
- org.springframework.util.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.integration.*;version="[1.0.3, 1.0.4)",
- org.springframework.security.*;version="[2.0.4.A, 3.0.0)",
+ org.springframework.aop.*;version="[3.0.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.core;version="[3.0.0, 4.0.0)",
+ org.springframework.util.*;version="[3.0.0, 4.0.0)",
+ org.springframework.integration.*;version="[2.0.0, 2.0.1)",
+ org.springframework.security.*;version="[2.0.5.RELEASE, 3.0.0)",
  org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.stream/template.mf b/org.springframework.integration.stream/template.mf
index c4ae5f54ed..9adfd38d95 100644
--- a/org.springframework.integration.stream/template.mf
+++ b/org.springframework.integration.stream/template.mf
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.springframework.beans.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.util;version="[2.5.6.A, 3.1.0)",
- org.springframework.integration.*;version="[1.0.3, 1.0.4)",
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util;version="[3.0.0, 4.0.0)",
+ org.springframework.integration.*;version="[2.0.0, 2.0.1)",
  org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.test/template.mf b/org.springframework.integration.test/template.mf
index 3b777a6953..a4ed3bd76b 100644
--- a/org.springframework.integration.test/template.mf
+++ b/org.springframework.integration.test/template.mf
@@ -3,8 +3,8 @@ Bundle-Name: Spring Integration Test Support
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.integration.*;version="[1.0.3, 1.0.4)",
+ org.springframework.*;version="[3.0.0, 4.0.0)",
+ org.springframework.integration.*;version="[2.0.0, 2.0.1)",
  org.junit.*;version="[4.6.0, 4.7.0)",
- org.mockito.*;version="[1.6.0,1.7.0]",
- org.hamcrest.*;version="[1.1.0, 1.1.0]"
\ No newline at end of file
+ org.mockito.*;version="[1.6.0, 1.7.0]",
+ org.hamcrest.*;version="[1.1.0, 1.1.0]"
diff --git a/org.springframework.integration.ws/.classpath b/org.springframework.integration.ws/.classpath
index 1a3f83d8bd..82d8debc6d 100644
--- a/org.springframework.integration.ws/.classpath
+++ b/org.springframework.integration.ws/.classpath
@@ -13,9 +13,9 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-348/org.springframework.context-3.0.0.CI-348.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-348/org.springframework.context-sources-3.0.0.CI-348.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-348/org.springframework.core-3.0.0.CI-348.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-348/org.springframework.core-sources-3.0.0.CI-348.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-348/org.springframework.expression-3.0.0.CI-348.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-348/org.springframework.expression-sources-3.0.0.CI-348.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.ws/1.5.5.A/org.springframework.ws-1.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.ws/1.5.5.A/org.springframework.ws-sources-1.5.5.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.5.A/org.springframework.oxm-1.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.5.A/org.springframework.oxm-sources-1.5.5.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.5.A/org.springframework.xml-1.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.5.A/org.springframework.xml-sources-1.5.5.A.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-348/org.springframework.test-3.0.0.CI-348.jar" sourcepath="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-348/org.springframework.test-sources-3.0.0.CI-348.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"/>
diff --git a/org.springframework.integration.ws/ivy.xml b/org.springframework.integration.ws/ivy.xml
index 9162d504de..7c63a9a748 100644
--- a/org.springframework.integration.ws/ivy.xml
+++ b/org.springframework.integration.ws/ivy.xml
@@ -24,10 +24,10 @@
 		<dependency org="javax.xml.soap" name="com.springsource.javax.xml.soap" rev="1.3.0" conf="provided->runtime"/>
 		<dependency org="javax.xml.stream" name="com.springsource.javax.xml.stream" rev="1.0.1" conf="provided->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework.ws" name="org.springframework.oxm" rev="1.5.5.A" conf="compile->runtime">
+		<dependency org="org.springframework.ws" name="org.springframework.oxm" rev="1.5.7.A" conf="compile->runtime">
 			<exclude org="org.springframework"/>
 		</dependency>
-		<dependency org="org.springframework.ws" name="org.springframework.ws" rev="1.5.5.A" conf="compile->runtime">
+		<dependency org="org.springframework.ws" name="org.springframework.ws" rev="1.5.7.A" conf="compile->runtime">
 			<exclude org="org.springframework"/>
 		</dependency>
 		<!-- test dependencies -->
diff --git a/org.springframework.integration.ws/template.mf b/org.springframework.integration.ws/template.mf
index 3231baecf6..1f06d41a06 100644
--- a/org.springframework.integration.ws/template.mf
+++ b/org.springframework.integration.ws/template.mf
@@ -3,12 +3,12 @@ Bundle-Name: Spring Integration Web Services Support
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.integration.*;version="[1.0.3, 1.0.4)",
- org.springframework.beans.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.context;version="[2.5.6.A, 3.1.0)",
- org.springframework.util;version="[2.5.6.A, 3.1.0)",
- org.springframework.oxm;version="[1.5.5.A, 2.0.0)",
- org.springframework.ws.*;version="[1.5.5.A, 2.0.0)",
- org.springframework.xml.transform;version="[1.5.5.A, 2.0.0)",
+ org.springframework.integration.*;version="[2.0.0, 2.0.1)",
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.context;version="[3.0.0, 4.0.0)",
+ org.springframework.util;version="[3.0.0, 4.0.0)",
+ org.springframework.oxm;version="[1.5.7.A, 2.0.0)",
+ org.springframework.ws.*;version="[1.5.7.A, 2.0.0)",
+ org.springframework.xml.transform;version="[1.5.7.A, 2.0.0)",
  org.w3c.dom.*;version="0",
  javax.xml.*;version="0"
diff --git a/org.springframework.integration.xml/.classpath b/org.springframework.integration.xml/.classpath
index 23c8657345..9f5193edc7 100644
--- a/org.springframework.integration.xml/.classpath
+++ b/org.springframework.integration.xml/.classpath
@@ -15,9 +15,9 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-348/org.springframework.context-3.0.0.CI-348.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.CI-348/org.springframework.context-sources-3.0.0.CI-348.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-348/org.springframework.core-3.0.0.CI-348.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.CI-348/org.springframework.core-sources-3.0.0.CI-348.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-348/org.springframework.expression-3.0.0.CI-348.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.CI-348/org.springframework.expression-sources-3.0.0.CI-348.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.5.A/org.springframework.oxm-1.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.5.A/org.springframework.oxm-sources-1.5.5.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.oxm.java5/1.5.5.A/org.springframework.oxm.java5-1.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.oxm.java5/1.5.5.A/org.springframework.oxm.java5-sources-1.5.5.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.5.A/org.springframework.xml-1.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.5.A/org.springframework.xml-sources-1.5.5.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.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-348/org.springframework.test-3.0.0.CI-348.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.CI-348/org.springframework.test-sources-3.0.0.CI-348.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"/>
diff --git a/org.springframework.integration.xml/ivy.xml b/org.springframework.integration.xml/ivy.xml
index d6d473d881..f2c08034ba 100644
--- a/org.springframework.integration.xml/ivy.xml
+++ b/org.springframework.integration.xml/ivy.xml
@@ -29,10 +29,10 @@
 		<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.springframework.ws" name="org.springframework.oxm" rev="1.5.5.A" conf="compile->runtime">
+		<dependency org="org.springframework.ws" name="org.springframework.oxm" rev="1.5.7.A" conf="compile->runtime">
 			<exclude org="org.springframework"/>
 		</dependency>
-		<dependency org="org.springframework.ws" name="org.springframework.oxm.java5" rev="1.5.5.A" conf="test->runtime">
+		<dependency org="org.springframework.ws" name="org.springframework.oxm.java5" rev="1.5.7.A" conf="test->runtime">
 			<exclude org="org.springframework"/>
 		</dependency>
 	</dependencies>
diff --git a/org.springframework.integration.xml/template.mf b/org.springframework.integration.xml/template.mf
index 0de8132591..6667b56acd 100644
--- a/org.springframework.integration.xml/template.mf
+++ b/org.springframework.integration.xml/template.mf
@@ -3,12 +3,12 @@ Bundle-Name: Spring Integration XML Support
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.integration.*;version="[1.0.3, 1.0.4)",
- org.springframework.beans.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.core.*;version="[2.5.6.A, 3.1.0)",
- org.springframework.util;version="[2.5.6.A, 3.1.0)",
- org.springframework.oxm;version="[1.5.5.A, 2.0.0)";resolution:=optional,
- org.springframework.xml.*;version="[1.5.5.A, 2.0.0)",
+ org.springframework.integration.*;version="[2.0.0, 2.0.1)",
+ org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util;version="[3.0.0, 4.0.0)",
+ org.springframework.oxm;version="[1.5.7.A, 2.0.0)";resolution:=optional,
+ org.springframework.xml.*;version="[1.5.7.A, 2.0.0)",
  org.w3c.dom.*;version="0",
  org.xml.sax.*;version="0",
  javax.xml.*;version="0"
diff --git a/org.springframework.integration/template.mf b/org.springframework.integration/template.mf
index 7d179d7cc8..8465d708be 100644
--- a/org.springframework.integration/template.mf
+++ b/org.springframework.integration/template.mf
@@ -3,7 +3,7 @@ Bundle-Name: Spring Integration Core
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.*;version="[2.5.6.A, 3.1.0)",
+ org.springframework.*;version="[3.0.0, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.aopalliance.*;version="[1.0.0,2.0.0)",
+ org.aopalliance.*;version="[1.0.0, 2.0.0)",
  org.w3c.dom.*;version="0"