diff --git a/build.gradle b/build.gradle
index 681c428ade..c76bd059c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,7 +62,7 @@ allprojects {
 
     // default set of maven repositories to be used when resolving dependencies
     repositories {
-        mavenRepo urls: 'http://maven.springframework.org/snapshot'
+        //mavenRepo urls: 'http://maven.springframework.org/snapshot'
         mavenCentral()
         mavenRepo urls: 'http://maven.springframework.org/release'
         mavenRepo urls: 'http://maven.springframework.org/milestone'
@@ -121,9 +121,9 @@ configure(javaprojects) {
     junitVersion = '4.8.2'
     log4jVersion = '1.2.12'
     mockitoVersion = '1.8.4'
-    springVersion = '3.0.5.RELEASE'
-    springSecurityVersion = '3.0.5.RELEASE'
-    springWsVersion = '2.0.2.RELEASE'
+    springVersion = '3.0.7.RELEASE'
+    springSecurityVersion = '3.0.7.RELEASE'
+    springWsVersion = '2.0.3.RELEASE'
 
     sourceSets {
         test {
@@ -333,19 +333,13 @@ project('spring-integration-rmi') {
     compileJava.options.compilerArgs = ["${xLintArg},-deprecation"]
 }
 
-
 project('spring-integration-security') {
     description = 'Spring Integration Security Support'
     dependencies {
         compile project(":spring-integration-core")
         compile "org.springframework:spring-aop:$springVersion"
         compile "org.springframework:spring-tx:$springVersion"
-        compile("org.springframework.security:spring-security-core:$springSecurityVersion") {
-            exclude group: 'org.springframework', module: 'spring-support'
-        }
-        compile("org.springframework.security:spring-security-config:$springSecurityVersion") {
-            exclude group: 'org.springframework', module: 'spring-support'
-        }
+        compile "org.springframework.security:spring-security-config:$springSecurityVersion"
     }
 }
 
@@ -397,7 +391,11 @@ project('spring-integration-ws') {
         compile project(":spring-integration-core")
         compile "org.springframework:spring-expression:$springVersion"
         compile "org.springframework:spring-oxm:$springVersion"
-        compile "org.springframework.ws:spring-ws-core:$springWsVersion"
+        compile("org.springframework.ws:spring-ws-core:$springWsVersion") {
+            exclude group: 'org.springframework', module: 'spring-context-support'
+            exclude group: 'org.springframework', module: 'spring-web'
+            exclude group: 'org.springframework', module: 'spring-webmvc'
+        }
         compile("javax.xml.soap:saaj-api:1.3") {
             optional = true
             exclude group: 'javax.activation', module: 'activation'
diff --git a/spring-integration-core/pom.xml b/spring-integration-core/pom.xml
index 747f63eb50..961615bf90 100644
--- a/spring-integration-core/pom.xml
+++ b/spring-integration-core/pom.xml
@@ -72,38 +72,40 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.5.RELEASE</version>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>3.0.7.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -112,6 +114,13 @@
       <version>1.6.8</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
@@ -124,18 +133,18 @@
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymockclassextension</artifactId>
@@ -149,19 +158,6 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-tx</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
diff --git a/spring-integration-event/pom.xml b/spring-integration-event/pom.xml
index 98554e6837..50c8706234 100644
--- a/spring-integration-event/pom.xml
+++ b/spring-integration-event/pom.xml
@@ -72,76 +72,78 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymockclassextension</artifactId>
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -154,12 +156,6 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-feed/pom.xml b/spring-integration-feed/pom.xml
index 5b3f64c847..e18e51ef37 100644
--- a/spring-integration-feed/pom.xml
+++ b/spring-integration-feed/pom.xml
@@ -72,39 +72,35 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>net.java.dev.rome</groupId>
@@ -130,6 +126,12 @@
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -142,18 +144,6 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
@@ -172,6 +162,12 @@
       <version>2.0.6.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>net.java.dev.rome</groupId>
       <artifactId>rome</artifactId>
diff --git a/spring-integration-file/pom.xml b/spring-integration-file/pom.xml
index 0ef2d28c82..f9f22ec41d 100644
--- a/spring-integration-file/pom.xml
+++ b/spring-integration-file/pom.xml
@@ -72,76 +72,78 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymockclassextension</artifactId>
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -154,12 +156,6 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-ftp/pom.xml b/spring-integration-ftp/pom.xml
index d5cff47d59..bc764b81fb 100644
--- a/spring-integration-ftp/pom.xml
+++ b/spring-integration-ftp/pom.xml
@@ -72,34 +72,42 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-file</artifactId>
@@ -136,12 +144,6 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
@@ -149,12 +151,6 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
@@ -168,10 +164,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context-support</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/spring-integration-groovy/pom.xml b/spring-integration-groovy/pom.xml
index 2b84104af9..2c310f9589 100644
--- a/spring-integration-groovy/pom.xml
+++ b/spring-integration-groovy/pom.xml
@@ -72,40 +72,48 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymockclassextension</artifactId>
@@ -118,12 +126,6 @@
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
@@ -137,9 +139,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context-support</artifactId>
-      <version>3.0.5.RELEASE</version>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -154,12 +156,6 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-http/pom.xml b/spring-integration-http/pom.xml
index 649404fb9c..23a03c485c 100644
--- a/spring-integration-http/pom.xml
+++ b/spring-integration-http/pom.xml
@@ -72,39 +72,35 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -112,6 +108,12 @@
       <version>2.4</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
@@ -149,18 +151,6 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
@@ -179,6 +169,12 @@
       <version>2.0.6.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java
index 8a9bbfdd11..3dcd35f661 100644
--- a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java
+++ b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java
@@ -174,11 +174,11 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests {
 	public void validateETag(){
 		HeaderMapper<HttpHeaders> mapper  = DefaultHttpHeaderMapper.inboundMapper();
 		Map<String, Object> messageHeaders = new HashMap<String, Object>();
-		messageHeaders.put("ETag", "1234");
+		messageHeaders.put("ETag", "\"1234\"");
 		HttpHeaders headers = new HttpHeaders();
 		
 		mapper.fromHeaders(new MessageHeaders(messageHeaders), headers);
-		assertEquals("1234", headers.getETag());
+		assertEquals("\"1234\"", headers.getETag());
 	}
 	
 	// Expires tests
diff --git a/spring-integration-httpinvoker/pom.xml b/spring-integration-httpinvoker/pom.xml
index bedf64c6ec..3812d7b3a7 100644
--- a/spring-integration-httpinvoker/pom.xml
+++ b/spring-integration-httpinvoker/pom.xml
@@ -72,40 +72,30 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -114,9 +104,9 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
@@ -124,24 +114,36 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
@@ -160,12 +162,6 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-ip/pom.xml b/spring-integration-ip/pom.xml
index 13cd3d759a..d494b4d2e6 100644
--- a/spring-integration-ip/pom.xml
+++ b/spring-integration-ip/pom.xml
@@ -72,40 +72,48 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymockclassextension</artifactId>
@@ -118,36 +126,30 @@
       <version>2.0.6.BUILD-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -160,12 +162,6 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-jdbc/pom.xml b/spring-integration-jdbc/pom.xml
index a61ec78e17..127730fed1 100644
--- a/spring-integration-jdbc/pom.xml
+++ b/spring-integration-jdbc/pom.xml
@@ -72,19 +72,15 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://objectstyle.org/maven2/</id>
@@ -92,28 +88,34 @@
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.0.5.RELEASE</version>
+      <version>3.0.7.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.5.RELEASE</version>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>3.0.7.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -128,6 +130,12 @@
       <version>1.6.8</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -140,6 +148,12 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
@@ -152,42 +166,18 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymockclassextension</artifactId>
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-tx</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
@@ -200,18 +190,24 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-      <version>1.6.8</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
       <version>2.0.6.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.6.8</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-jms/pom.xml b/spring-integration-jms/pom.xml
index 2249092e66..fbe6de0ffb 100644
--- a/spring-integration-jms/pom.xml
+++ b/spring-integration-jms/pom.xml
@@ -72,31 +72,27 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -108,20 +104,14 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-jms</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-oxm</artifactId>
-      <version>3.0.5.RELEASE</version>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.5.RELEASE</version>
+      <artifactId>spring-tx</artifactId>
+      <version>3.0.7.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -142,6 +132,12 @@
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -154,22 +150,10 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-tx</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
+      <artifactId>spring-oxm</artifactId>
+      <version>3.0.7.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -190,12 +174,24 @@
       <version>2.0.6.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
       <version>4.8.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jms</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
   <properties>
     <project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
diff --git a/spring-integration-jmx/pom.xml b/spring-integration-jmx/pom.xml
index 554dc16a37..75928b6551 100644
--- a/spring-integration-jmx/pom.xml
+++ b/spring-integration-jmx/pom.xml
@@ -72,39 +72,35 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
@@ -124,6 +120,12 @@
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -136,18 +138,6 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
@@ -161,15 +151,21 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-      <version>1.6.8</version>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
+      <artifactId>spring-integration-test</artifactId>
       <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.6.8</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/spring-integration-mail/pom.xml b/spring-integration-mail/pom.xml
index 5fb7fef181..3e824e9ef5 100644
--- a/spring-integration-mail/pom.xml
+++ b/spring-integration-mail/pom.xml
@@ -72,34 +72,42 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
@@ -124,12 +132,6 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
@@ -137,12 +139,6 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
@@ -155,18 +151,18 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context-support</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
       <version>2.0.6.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
diff --git a/spring-integration-rmi/pom.xml b/spring-integration-rmi/pom.xml
index 178dcb5a39..fa1275a4ca 100644
--- a/spring-integration-rmi/pom.xml
+++ b/spring-integration-rmi/pom.xml
@@ -72,34 +72,36 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -108,9 +110,9 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
@@ -118,16 +120,10 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.5.RELEASE</version>
+      <artifactId>spring-aop</artifactId>
+      <version>3.0.7.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -136,18 +132,24 @@
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -160,12 +162,6 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-security/pom.xml b/spring-integration-security/pom.xml
index 95e1d8e8dd..4c824816e2 100644
--- a/spring-integration-security/pom.xml
+++ b/spring-integration-security/pom.xml
@@ -72,58 +72,30 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-core</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>spring-support</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-      <version>2.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.12</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -132,9 +104,9 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
@@ -144,22 +116,22 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-tx</artifactId>
-      <version>3.0.5.RELEASE</version>
+      <artifactId>spring-aop</artifactId>
+      <version>3.0.7.RELEASE</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
@@ -167,16 +139,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-config</artifactId>
-      <version>3.0.5.RELEASE</version>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>3.0.7.RELEASE</version>
       <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>spring-support</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
@@ -184,6 +150,18 @@
       <version>2.0.6.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-sftp/pom.xml b/spring-integration-sftp/pom.xml
index efdf5c1bd2..e318391c24 100644
--- a/spring-integration-sftp/pom.xml
+++ b/spring-integration-sftp/pom.xml
@@ -72,31 +72,27 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -107,17 +103,29 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-file</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>3.0.7.RELEASE</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-file</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
@@ -136,12 +144,6 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-stream</artifactId>
@@ -155,12 +157,6 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
@@ -173,18 +169,18 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context-support</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
       <version>2.0.6.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-stream/pom.xml b/spring-integration-stream/pom.xml
index b468bbd212..e3c2598873 100644
--- a/spring-integration-stream/pom.xml
+++ b/spring-integration-stream/pom.xml
@@ -72,70 +72,72 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymockclassextension</artifactId>
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -148,12 +150,6 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-test/pom.xml b/spring-integration-test/pom.xml
index b996929fa5..0d26072038 100644
--- a/spring-integration-test/pom.xml
+++ b/spring-integration-test/pom.xml
@@ -72,70 +72,72 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymockclassextension</artifactId>
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.8.4</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -148,12 +150,6 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-twitter/pom.xml b/spring-integration-twitter/pom.xml
index eba12c4dee..1a15dcd066 100644
--- a/spring-integration-twitter/pom.xml
+++ b/spring-integration-twitter/pom.xml
@@ -72,34 +72,42 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.twitter4j</groupId>
       <artifactId>twitter4j-core</artifactId>
@@ -130,12 +138,6 @@
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
@@ -143,12 +145,6 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
@@ -161,18 +157,18 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context-support</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
       <version>2.0.6.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml
index 925f23c7aa..b868ae4058 100644
--- a/spring-integration-ws/pom.xml
+++ b/spring-integration-ws/pom.xml
@@ -72,39 +72,35 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-expression</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.sun.xml.messaging.saaj</groupId>
@@ -113,24 +109,12 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-oxm</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.ws</groupId>
-      <artifactId>spring-ws-core</artifactId>
-      <version>2.0.2.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
@@ -150,6 +134,26 @@
       </exclusions>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.ws</groupId>
+      <artifactId>spring-ws-core</artifactId>
+      <version>2.0.3.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>spring-web</artifactId>
+          <groupId>org.springframework</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>spring-webmvc</artifactId>
+          <groupId>org.springframework</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>spring-context-support</artifactId>
+          <groupId>org.springframework</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -168,12 +172,6 @@
       <version>1.0.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
@@ -182,15 +180,21 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-expression</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
+      <artifactId>spring-oxm</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <version>1.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -205,6 +209,12 @@
       <version>2.0.6.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-xml/pom.xml b/spring-integration-xml/pom.xml
index 401eef98d2..d3b64ef25c 100644
--- a/spring-integration-xml/pom.xml
+++ b/spring-integration-xml/pom.xml
@@ -72,51 +72,35 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-oxm</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.ws</groupId>
-      <artifactId>spring-xml</artifactId>
-      <version>2.0.2.RELEASE</version>
-      <scope>compile</scope>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>xmlunit</groupId>
@@ -148,6 +132,12 @@
       <version>2.0EA3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -167,10 +157,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
+      <groupId>org.springframework.ws</groupId>
+      <artifactId>spring-xml</artifactId>
+      <version>2.0.3.RELEASE</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>javax.activation</groupId>
@@ -179,18 +169,18 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-oxm</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
@@ -203,6 +193,12 @@
       <version>2.0.6.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-xmpp/pom.xml b/spring-integration-xmpp/pom.xml
index accd4801ba..efc3114f65 100644
--- a/spring-integration-xmpp/pom.xml
+++ b/spring-integration-xmpp/pom.xml
@@ -72,34 +72,42 @@
   <repositories>
     <repository>
       <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <url>http://download.java.net/maven/2/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
       <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <url>http://repository.springsource.com/maven/bundles/milestone/</url>
     </repository>
     <repository>
       <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.7.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
@@ -130,12 +138,6 @@
       <version>2.0.6.BUILD-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.0.6.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
@@ -155,12 +157,6 @@
       <version>3.1.0</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
@@ -173,18 +169,18 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context-support</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
       <version>2.0.6.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.0.6.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>