diff --git a/advanced/advanced-testing-examples/readme.txt b/advanced/advanced-testing-examples/README.md
similarity index 80%
rename from advanced/advanced-testing-examples/readme.txt
rename to advanced/advanced-testing-examples/README.md
index 915b7c7f..95224574 100644
--- a/advanced/advanced-testing-examples/readme.txt
+++ b/advanced/advanced-testing-examples/README.md
@@ -1,9 +1,12 @@
-Example test cases that show advanced techniques to test Spring Integration applications. 
+Advanced Testing Examples
+=========================
 
-For basic testing examples see basic/testing-examples
+Example test cases that show advanced techniques to test Spring Integration based applications. 
+
+For basic testing examples see: *basic/testing-examples*
+
+## Examples
 
-Examples
-========
 ...jms.JmsMockTests.java
 
 This test case shows how to test an integration flow that uses JMS inbound channel adapter
diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml
index b5769975..49ef9a91 100644
--- a/advanced/advanced-testing-examples/pom.xml
+++ b/advanced/advanced-testing-examples/pom.xml
@@ -4,14 +4,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>advanced-testing-examples</artifactId>
-	<version>2.0.0</version>	
-	<name>Spring Integration Advanced Testing Examples</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<name>Samples (Advanced) - Advanced Testing Examples</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
-		<spring.version>3.0.5.RELEASE</spring.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+		<spring.version>3.1.0.RELEASE</spring.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/advanced/advanced-testing-examples/src/main/resources/integration-config.xml b/advanced/advanced-testing-examples/src/main/resources/integration-config.xml
index af6c98fc..d179b99b 100644
--- a/advanced/advanced-testing-examples/src/main/resources/integration-config.xml
+++ b/advanced/advanced-testing-examples/src/main/resources/integration-config.xml
@@ -3,8 +3,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-groovy="http://www.springframework.org/schema/integration/groovy"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/groovy http://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/groovy http://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 	<!-- 
 		This implements the core business logic of the integration flow. Not
diff --git a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml
index a8132d53..acfccd05 100644
--- a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml
+++ b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml
@@ -3,8 +3,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-jms="http://www.springframework.org/schema/integration/jms"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 	
 	<!--
diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml
index b5118cda..8a35905b 100644
--- a/advanced/dynamic-ftp/pom.xml
+++ b/advanced/dynamic-ftp/pom.xml
@@ -2,14 +2,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.integration.samples</groupId>
  <artifactId>dynamic-ftp</artifactId>
-	<version>2.1.0</version>
-	<name>Dynamic FTP Demo</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Samples (Advanced) - Dynamic FTP Demo</name>
 	<packaging>jar</packaging>
 	<properties>
 		<spring.framework.version>3.1.0.RELEASE</spring.framework.version>
 		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/advanced/dynamic-ftp/src/main/resources/META-INF/spring/integration/dynamic-ftp-outbound-adapter-context.xml b/advanced/dynamic-ftp/src/main/resources/META-INF/spring/integration/dynamic-ftp-outbound-adapter-context.xml
index a5656816..8d8f1f27 100644
--- a/advanced/dynamic-ftp/src/main/resources/META-INF/spring/integration/dynamic-ftp-outbound-adapter-context.xml
+++ b/advanced/dynamic-ftp/src/main/resources/META-INF/spring/integration/dynamic-ftp-outbound-adapter-context.xml
@@ -4,10 +4,10 @@
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-ftp="http://www.springframework.org/schema/integration/ftp"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-		http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd">
 
 	<context:property-placeholder />
 
diff --git a/advanced/dynamic-ftp/src/test/resources/META-INF/spring/integration/DynamicFtpOutboundChannelAdapterSample-context.xml b/advanced/dynamic-ftp/src/test/resources/META-INF/spring/integration/DynamicFtpOutboundChannelAdapterSample-context.xml
index c83c9941..4f90ab98 100644
--- a/advanced/dynamic-ftp/src/test/resources/META-INF/spring/integration/DynamicFtpOutboundChannelAdapterSample-context.xml
+++ b/advanced/dynamic-ftp/src/test/resources/META-INF/spring/integration/DynamicFtpOutboundChannelAdapterSample-context.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<bean id="channelResolver" class="org.springframework.integration.samples.ftp.DynamicFtpChannelResolver" />
 
diff --git a/advanced/pom.xml b/advanced/pom.xml
index a4f79b39..1fb63896 100644
--- a/advanced/pom.xml
+++ b/advanced/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.integration.samples</groupId>
 	<artifactId>advanced-samples</artifactId>
-	<version>2.0.0</version>
-	<name>Advanced Spring Integration Samples</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Spring Integration Samples - Advanced</name>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml
index 011dcee9..fe43ae78 100644
--- a/applications/cafe-scripted/pom.xml
+++ b/applications/cafe-scripted/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>cafe-scripted</artifactId>
-	<version>2.1.0</version>
-	<name>Spring Integration Cafe Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Samples (Applications) - Cafe Sample (Scripted Implementation)</name>
 	<properties>
 		<spring.integration.version>2.1.0.RC1</spring.integration.version>
-		<spring.version>3.1.0.RC1</spring.version>
+		<spring.version>3.1.0.RELEASE</spring.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 
 	<dependencies>
diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml
index a823958b..9fe7964d 100644
--- a/applications/cafe/pom.xml
+++ b/applications/cafe/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>cafe</artifactId>
-	<version>2.0.0</version>
-	<name>Spring Integration Cafe Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Samples (Applications) - Cafe Sample</name>
 	<properties>
-		<spring.integration.version>2.1.0.M3</spring.integration.version>
-        <spring.core.version>3.1.0.RC1</spring.core.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+        <spring.core.version>3.1.0.RELEASE</spring.core.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
         <dependency>
@@ -37,12 +37,12 @@
 		<dependency>
 		    <groupId>org.codehaus.jackson</groupId>
 		    <artifactId>jackson-core-asl</artifactId>
-		    <version>1.8.3</version>
+		    <version>1.9.2</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.codehaus.jackson</groupId>
 		    <artifactId>jackson-mapper-asl</artifactId>
-		    <version>1.8.3</version>
+		    <version>1.9.2</version>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
diff --git a/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppAmqp.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppAmqp.java
index 4d259852..357bfbcb 100644
--- a/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppAmqp.java
+++ b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppAmqp.java
@@ -17,7 +17,6 @@
 package org.springframework.integration.samples.cafe.xml;
 
 import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.samples.cafe.Cafe;
 import org.springframework.integration.samples.cafe.DrinkType;
 import org.springframework.integration.samples.cafe.Order;
diff --git a/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaColdAmqp.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaColdAmqp.java
index 2fa94d32..b3c93cbe 100644
--- a/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaColdAmqp.java
+++ b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaColdAmqp.java
@@ -19,10 +19,6 @@ package org.springframework.integration.samples.cafe.xml;
 import java.io.IOException;
 
 import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.samples.cafe.Cafe;
-import org.springframework.integration.samples.cafe.DrinkType;
-import org.springframework.integration.samples.cafe.Order;
 
 /**
  * Provides the 'main' method for running the Cafe Demo Cold Drink 
diff --git a/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaHotAmqp.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaHotAmqp.java
index 0d37cad6..0cc19928 100644
--- a/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaHotAmqp.java
+++ b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppBaristaHotAmqp.java
@@ -19,10 +19,6 @@ package org.springframework.integration.samples.cafe.xml;
 import java.io.IOException;
 
 import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.samples.cafe.Cafe;
-import org.springframework.integration.samples.cafe.DrinkType;
-import org.springframework.integration.samples.cafe.Order;
 
 /**
  * Provides the 'main' method for running the Cafe Demo Hot Drink 
diff --git a/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppOperationsAmqp.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppOperationsAmqp.java
index f2246647..dbdb7ec8 100644
--- a/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppOperationsAmqp.java
+++ b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppOperationsAmqp.java
@@ -19,10 +19,6 @@ package org.springframework.integration.samples.cafe.xml;
 import java.io.IOException;
 
 import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.samples.cafe.Cafe;
-import org.springframework.integration.samples.cafe.DrinkType;
-import org.springframework.integration.samples.cafe.Order;
 
 /**
  * Provides the 'main' method for running the Cafe Demo Operations 
diff --git a/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppUtilities.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppUtilities.java
index 6eac278f..4abccda3 100644
--- a/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppUtilities.java
+++ b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppUtilities.java
@@ -2,9 +2,6 @@ package org.springframework.integration.samples.cafe.xml;
 
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.GenericXmlApplicationContext;
-import org.springframework.integration.samples.cafe.Cafe;
-import org.springframework.integration.samples.cafe.DrinkType;
-import org.springframework.integration.samples.cafe.Order;
 
 public class CafeDemoAppUtilities {
 
diff --git a/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml b/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml
index 1f9fc98f..cd745a9d 100644
--- a/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml
+++ b/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaCold-xml.xml
@@ -7,15 +7,15 @@
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xmlns:cloud="http://schema.cloudfoundry.org/spring"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://schema.cloudfoundry.org/spring
 			http://schema.cloudfoundry.org/spring/cloudfoundry-spring-0.8.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/amqp 
 			http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
 			http://www.springframework.org/schema/rabbit 
-			http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd
+			http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
diff --git a/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml b/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml
index 1a873715..81d84541 100644
--- a/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml
+++ b/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-baristaHot-xml.xml
@@ -7,15 +7,15 @@
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xmlns:cloud="http://schema.cloudfoundry.org/spring"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://schema.cloudfoundry.org/spring
 			http://schema.cloudfoundry.org/spring/cloudfoundry-spring-0.8.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/amqp 
 			http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
 			http://www.springframework.org/schema/rabbit 
-			http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd
+			http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
diff --git a/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-config-xml.xml b/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-config-xml.xml
index 3ac623d0..652882a2 100644
--- a/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-config-xml.xml
+++ b/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-config-xml.xml
@@ -4,11 +4,11 @@
     xmlns:rabbit="http://www.springframework.org/schema/rabbit"
     xmlns:cloud="http://schema.cloudfoundry.org/spring"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://schema.cloudfoundry.org/spring
 			http://schema.cloudfoundry.org/spring/cloudfoundry-spring-0.8.xsd
 			http://www.springframework.org/schema/rabbit 
-			http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd">
+			http://www.springframework.org/schema/rabbit/spring-rabbit.xsd">
 
     <!-- Set up the AmqpTemplate/RabbitTemplate: -->
     <rabbit:template id="amqpTemplate"
diff --git a/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml b/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml
index 6235a8e6..6725f790 100644
--- a/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml
+++ b/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-operations-xml.xml
@@ -7,15 +7,15 @@
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xmlns:cloud="http://schema.cloudfoundry.org/spring"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://schema.cloudfoundry.org/spring
 			http://schema.cloudfoundry.org/spring/cloudfoundry-spring-0.8.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/amqp 
 			http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
 			http://www.springframework.org/schema/rabbit 
-			http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd
+			http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
diff --git a/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml b/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml
index 676165b6..138615e0 100644
--- a/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml
+++ b/applications/cafe/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-xml.xml
@@ -7,15 +7,15 @@
 	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xmlns:cloud="http://schema.cloudfoundry.org/spring"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://schema.cloudfoundry.org/spring
 			http://schema.cloudfoundry.org/spring/cloudfoundry-spring-0.8.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/amqp 
 			http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
 			http://www.springframework.org/schema/rabbit 
-			http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd
+			http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml
index 7d6f928e..7082fce2 100644
--- a/applications/loan-broker/pom.xml
+++ b/applications/loan-broker/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>loan-broker</artifactId>
-	<version>2.0.0</version>
-	<name>Spring Integration Loan Broker Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Samples (Applications) - Loan Broker</name>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<commons-logging.version>1.1.1</commons-logging.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/applications/loan-broker/src/main/resources/META-INF/spring/integration/shark-detector-config.xml b/applications/loan-broker/src/main/resources/META-INF/spring/integration/shark-detector-config.xml
index 991675f4..40f52650 100644
--- a/applications/loan-broker/src/main/resources/META-INF/spring/integration/shark-detector-config.xml
+++ b/applications/loan-broker/src/main/resources/META-INF/spring/integration/shark-detector-config.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:int-ip="http://www.springframework.org/schema/integration/ip"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/ip http://www.springframework.org/schema/integration/ip/spring-integration-ip-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/ip http://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd">
 
 	<channel id="loanQuotesChannel">
 		<interceptors>
diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml
index 7ffc9034..769288e3 100644
--- a/applications/loanshark/pom.xml
+++ b/applications/loanshark/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
-	<version>2.0.0.BUILD-SNAPSHOT</version>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<artifactId>loanshark</artifactId>
-	<name>Spring Integration Loan Shark Sample</name>
+	<name>Samples (Applications) - Loan Shark</name>
 	<packaging>war</packaging>
 	<properties>
-		<spring.version>3.0.5.RELEASE</spring.version>
+		<spring.version>3.1.0.RELEASE</spring.version>
 		<aspectj.version>1.6.10</aspectj.version>
 		<slf4j.version>1.6.1</slf4j.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -343,7 +343,7 @@
     <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-ip</artifactId>
-            <version>2.0.5.RELEASE</version>
+            <version>2.1.0.RC1</version>
         </dependency>
     </dependencies>
 	<build>
diff --git a/applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml b/applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml
index df3a201d..8cf2da1e 100644
--- a/applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml
+++ b/applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.0.xsd   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee.xsd   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
 	<import resource="integrationContext.xml"/>
     <!--
 		This will automatically locate any and all property files you have
diff --git a/applications/loanshark/src/main/resources/META-INF/spring/integrationContext.xml b/applications/loanshark/src/main/resources/META-INF/spring/integrationContext.xml
index e54e0e0a..0e4e2972 100644
--- a/applications/loanshark/src/main/resources/META-INF/spring/integrationContext.xml
+++ b/applications/loanshark/src/main/resources/META-INF/spring/integrationContext.xml
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-ip="http://www.springframework.org/schema/integration/ip"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/integration/ip http://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd">
 
diff --git a/applications/loanshark/src/main/webapp/WEB-INF/spring/webmvc-config.xml b/applications/loanshark/src/main/webapp/WEB-INF/spring/webmvc-config.xml
index 63a06953..3b92e03e 100644
--- a/applications/loanshark/src/main/webapp/WEB-INF/spring/webmvc-config.xml
+++ b/applications/loanshark/src/main/webapp/WEB-INF/spring/webmvc-config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd     http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd     http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 				
 	<!-- The controllers are autodetected POJOs labeled with the @Controller annotation. -->
 	<context:component-scan base-package="org.springframework.integration.samples.loanbroker.loanshark" use-default-filters="false">
diff --git a/applications/pom.xml b/applications/pom.xml
index f1f3598a..35da45fd 100644
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.integration.samples</groupId>
 	<artifactId>applications</artifactId>
-	<version>2.0.0</version>
-	<name>Spring Integration Sample Applications</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Spring Integration Samples - Applications</name>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml
index aabc84c7..c015a200 100644
--- a/basic/amqp/pom.xml
+++ b/basic/amqp/pom.xml
@@ -4,17 +4,17 @@
 
     <groupId>org.springframework.integration.samples</groupId>
     <artifactId>amqp</artifactId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.1.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>amqp</name>
+    <name>Samples (Basic) - AMQP</name>
     <url>http://www.springsource.org/spring-integration</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.integration.version>2.1.0.BUILD-SNAPSHOT</spring.integration.version>
-        <slf4j.version>1.6.1</slf4j.version>
-        <junit.version>4.7</junit.version>
+        <spring.integration.version>2.1.0.RC1</spring.integration.version>
+        <slf4j.version>1.6.4</slf4j.version>
+        <junit.version>4.10</junit.version>
     </properties>
 
     <repositories>
@@ -110,7 +110,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>0.9.28</version>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
index 1a1a748c..125457f0 100644
--- a/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
+++ b/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
@@ -6,9 +6,9 @@
 	xmlns:rabbit="http://www.springframework.org/schema/rabbit"
 	xmlns:int-stream="http://www.springframework.org/schema/integration/stream"
 	xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd
-		http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd
+		http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
         
     <!-- From STDIN To RabbitMQ -->
diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml
index 46965739..7ef4fa93 100644
--- a/basic/control-bus/pom.xml
+++ b/basic/control-bus/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>control-bus</artifactId>
-	<version>2.0.0</version>	
-	<name>Spring Integration Hello World Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<name>Samples (Basic) - Control Bus</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/basic/control-bus/src/main/resources/META-INF/spring/integration/ControlBusDemo-context.xml b/basic/control-bus/src/main/resources/META-INF/spring/integration/ControlBusDemo-context.xml
index 335d9989..a6a1c074 100644
--- a/basic/control-bus/src/main/resources/META-INF/spring/integration/ControlBusDemo-context.xml
+++ b/basic/control-bus/src/main/resources/META-INF/spring/integration/ControlBusDemo-context.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<int:channel id="controlChannel"/>
 	
diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml
index 9c109744..3b33985b 100644
--- a/basic/enricher/pom.xml
+++ b/basic/enricher/pom.xml
@@ -4,17 +4,17 @@
 
     <groupId>org.springframework.integration.samples</groupId>
     <artifactId>enricher</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>2.1.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>enricher-sample</name>
+    <name>Samples (Basic) - Enricher</name>
     <url>http://www.springsource.org/spring-integration</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.integration.version>2.1.0.BUILD-SNAPSHOT</spring.integration.version>
-        <slf4j.version>1.6.1</slf4j.version>
-        <junit.version>4.7</junit.version>
+        <spring.integration.version>2.1.0.RC1</spring.integration.version>
+        <slf4j.version>1.6.4</slf4j.version>
+        <junit.version>4.10</junit.version>
     </properties>
 
     <repositories>
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>0.9.28</version>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -116,7 +116,7 @@
         <dependency>
 	        <groupId>com.h2database</groupId>
 	        <artifactId>h2</artifactId>
-	        <version>1.3.160</version>
+	        <version>1.3.162</version>
 	    </dependency>
 
     </dependencies>
diff --git a/basic/enricher/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/basic/enricher/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
index b9b57f57..2511b3aa 100644
--- a/basic/enricher/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
+++ b/basic/enricher/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <int:channel id="findUserEnricherChannel"/>
diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml
index 9df267b0..954556a1 100644
--- a/basic/feed/pom.xml
+++ b/basic/feed/pom.xml
@@ -2,13 +2,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.integration.samples</groupId>
   <artifactId>feed</artifactId>
-	<version>2.0.0</version>
-	<name>Feed Demo (RSS/ATOM)</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Samples (Basic) - Feed Demo (RSS/ATOM)</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/basic/feed/src/test/resources/META-INF/spring/integration/FeedInboundChannelAdapterSample-context.xml b/basic/feed/src/test/resources/META-INF/spring/integration/FeedInboundChannelAdapterSample-context.xml
index e4fd33a5..f69d779a 100644
--- a/basic/feed/src/test/resources/META-INF/spring/integration/FeedInboundChannelAdapterSample-context.xml
+++ b/basic/feed/src/test/resources/META-INF/spring/integration/FeedInboundChannelAdapterSample-context.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-feed="http://www.springframework.org/schema/integration/feed"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-			http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-			http://www.springframework.org/schema/integration/feed http://www.springframework.org/schema/integration/feed/spring-integration-feed-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+			http://www.springframework.org/schema/integration/feed http://www.springframework.org/schema/integration/feed/spring-integration-feed.xsd">
 	
 	<int-feed:inbound-channel-adapter id="feedAdapter" 
 						channel="feedChannel" 
diff --git a/basic/file/pom.xml b/basic/file/pom.xml
index c562776d..7221c26d 100644
--- a/basic/file/pom.xml
+++ b/basic/file/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>file</artifactId>
-	<version>2.0.0</version>	
-	<name>Spring Integration File Copy Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<name>Samples (Basic) - File Copy</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml
index 4e0d715a..8708f61d 100644
--- a/basic/ftp/pom.xml
+++ b/basic/ftp/pom.xml
@@ -2,13 +2,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.integration.samples</groupId>
  <artifactId>ftp</artifactId>
-	<version>2.0.0</version>
-	<name>FTP Demo</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Samples (Basic) - FTP Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.M1</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml
index 191d74d8..6f9c047f 100644
--- a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml
+++ b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml
@@ -4,10 +4,10 @@
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-ftp="http://www.springframework.org/schema/integration/ftp"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd">
 
 	<context:property-placeholder location="classpath:user.properties"/>
 	
diff --git a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml
index 6328f72c..b5b0c709 100644
--- a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml
+++ b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml
@@ -4,10 +4,10 @@
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-ftp="http://www.springframework.org/schema/integration/ftp"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd">
 
 	<context:property-placeholder location="classpath:user.properties"/>
 
diff --git a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml
index 4fa6b697..96654280 100644
--- a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml
+++ b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml
@@ -4,10 +4,10 @@
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-ftp="http://www.springframework.org/schema/integration/ftp"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.1.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<context:property-placeholder location="classpath:user.properties"/>
 
diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml
index 4f765020..a8161b00 100644
--- a/basic/helloworld/pom.xml
+++ b/basic/helloworld/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>helloworld</artifactId>
-	<version>2.0.0</version>	
-	<name>Spring Integration Hello World Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<name>Samples (Basic) - Hello World Sample</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/basic/helloworld/src/main/resources/META-INF/spring/integration/delay.xml b/basic/helloworld/src/main/resources/META-INF/spring/integration/delay.xml
index 3eb8f2a7..7345602b 100644
--- a/basic/helloworld/src/main/resources/META-INF/spring/integration/delay.xml
+++ b/basic/helloworld/src/main/resources/META-INF/spring/integration/delay.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:task="http://www.springframework.org/schema/task">
 
diff --git a/basic/http/pom.xml b/basic/http/pom.xml
index 9ec59b9d..51a9dee1 100644
--- a/basic/http/pom.xml
+++ b/basic/http/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>http</artifactId>
-	<version>2.0.0</version>
-	<name>Spring Integration HTTP Demo</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Samples (Basic) - HTTP Demo</name>
 	<packaging>war</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
-		<spring.version>3.0.5.RELEASE</spring.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+		<spring.version>3.1.0.RELEASE</spring.version>
 		<commons-fileupload>1.2</commons-fileupload>
 		<commons-io>1.3.2</commons-io>
 		<log4j.version>1.2.16</log4j.version>
diff --git a/basic/http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml b/basic/http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml
index 1cfa4342..1fb95cb8 100644
--- a/basic/http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml
+++ b/basic/http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-http="http://www.springframework.org/schema/integration/http"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd">
 
 	<int:gateway id="requestGateway" 
 	             service-interface="org.springframework.integration.samples.http.RequestGateway"
diff --git a/basic/http/src/main/webapp/WEB-INF/servlet-config.xml b/basic/http/src/main/webapp/WEB-INF/servlet-config.xml
index 3139dbc8..503b5977 100644
--- a/basic/http/src/main/webapp/WEB-INF/servlet-config.xml
+++ b/basic/http/src/main/webapp/WEB-INF/servlet-config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-2.0.xsd
-		http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http-2.0.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd
+		http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-file="http://www.springframework.org/schema/integration/file"
 	xmlns:int-http="http://www.springframework.org/schema/integration/http"
diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml
index 976b160b..2292745b 100644
--- a/basic/jdbc/pom.xml
+++ b/basic/jdbc/pom.xml
@@ -4,17 +4,17 @@
 
     <groupId>org.springframework.integration.samples</groupId>
     <artifactId>jdbc</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>2.1.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>jdbc-sample</name>
+    <name>Samples (Basic) - JDBC</name>
     <url>http://www.springsource.org/spring-integration</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.integration.version>2.1.0.M3</spring.integration.version>
-        <slf4j.version>1.6.1</slf4j.version>
-        <junit.version>4.7</junit.version>
+        <spring.integration.version>2.1.0.RC1</spring.integration.version>
+        <slf4j.version>1.6.4</slf4j.version>
+        <junit.version>4.10</junit.version>
     </properties>
 
     <repositories>
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>0.9.28</version>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -122,8 +122,7 @@
         <dependency>
 	        <groupId>com.h2database</groupId>
 	        <artifactId>h2</artifactId>
-	        <version>1.3.160</version>
-	    </dependency>	    
-		
+	        <version>1.3.162</version>
+	    </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/basic/jdbc/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/basic/jdbc/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
index 5c9e0f98..efcd5900 100644
--- a/basic/jdbc/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
+++ b/basic/jdbc/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
@@ -4,9 +4,9 @@
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-jdbc="http://www.springframework.org/schema/integration/jdbc"
 	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.1.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <int:channel id="requestChannel"/>
diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml
index 153136d2..9fafc7cf 100644
--- a/basic/jms/pom.xml
+++ b/basic/jms/pom.xml
@@ -4,18 +4,24 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>jms</artifactId>
-	<version>2.0.0</version>	
-	<name>Spring Integration JMS Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<name>Samples (Basic) - JMS</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
-		<activemq.version>5.2.0</activemq.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+		<activemq.version>5.5.1</activemq.version>
 	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>activemq-core</artifactId>
 			<version>${activemq.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>spring-context</artifactId>
+					<groupId>org.springframework</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 <!-- 		<dependency> -->
 <!-- 			<groupId>org.springframework.integration</groupId> -->
@@ -25,13 +31,23 @@
  <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jms</artifactId>
-      <version>3.0.5.RELEASE</version>
+      <version>3.1.0.RELEASE</version>
       <scope>compile</scope>
     </dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-core</artifactId>
 			<version>${spring.integration.version}</version>
+        </dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-core</artifactId>
+			<version>${spring.integration.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-stream</artifactId>
+			<version>${spring.integration.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml
index 8aa8f732..0ec68000 100644
--- a/basic/jmx/pom.xml
+++ b/basic/jmx/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>jmx</artifactId>
-	<name>Spring Integration JMX Sample</name>
-	<version>2.0.0</version>	
+	<name>Samples (Basic) - JMX</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>	
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/basic/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml b/basic/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml
index e3aceb8a..f621c0d5 100644
--- a/basic/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml
+++ b/basic/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml
@@ -8,7 +8,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/integration/jmx http://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.0.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
 		http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
 
 	<context:mbean-export/>
diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml
index 10a5e2c5..09bad403 100644
--- a/basic/mail/pom.xml
+++ b/basic/mail/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>mail</artifactId>
-	<name>Spring Integration IMAP IDLE Sample</name>
-	<version>2.0.0</version>
+	<name>Samples (Basic) - Mail Demo (IMAP + POP3)</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -25,7 +25,7 @@
 		<dependency>
 			<groupId>javax.mail</groupId>
 			<artifactId>mail</artifactId>
-			<version>1.4.1</version>
+			<version>1.4.4</version>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
diff --git a/basic/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml b/basic/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml
index 3a97a662..211cace3 100644
--- a/basic/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml
+++ b/basic/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail-2.0.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-mail="http://www.springframework.org/schema/integration/mail"
 	xmlns:util="http://www.springframework.org/schema/util">
diff --git a/basic/mail/src/main/resources/META-INF/spring/integration/gmail-pop3-config.xml b/basic/mail/src/main/resources/META-INF/spring/integration/gmail-pop3-config.xml
index 4b46abbf..003bbfda 100644
--- a/basic/mail/src/main/resources/META-INF/spring/integration/gmail-pop3-config.xml
+++ b/basic/mail/src/main/resources/META-INF/spring/integration/gmail-pop3-config.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail-2.0.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-mail="http://www.springframework.org/schema/integration/mail"
 	xmlns:util="http://www.springframework.org/schema/util">
diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml
index a327caba..9495a508 100644
--- a/basic/oddeven/pom.xml
+++ b/basic/oddeven/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>oddeven</artifactId>
-	<name>Spring Integration Odd-Even Sample</name>
-	<version>2.0.0</version>	
+	<name>Samples (Basic) - Odd-Even Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>	
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/basic/pom.xml b/basic/pom.xml
index 61289677..f232d928 100644
--- a/basic/pom.xml
+++ b/basic/pom.xml
@@ -5,17 +5,19 @@
 	<modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.integration.samples</groupId>
 	<artifactId>basic-samples</artifactId>
-	<version>2.0.0</version>
-	<name>Basic Spring Integration Samples</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Spring Integration Samples - Basic</name>
 	<packaging>pom</packaging>
 
 	<modules>
         <module>amqp</module>
+        <module>control-bus</module>
         <module>enricher</module>
         <module>feed</module>
         <module>file</module>
-        <module>ftp</module>
+        <!-- <module>ftp</module> -->
         <module>helloworld</module>
+        <module>http</module>
         <module>jdbc</module>
         <module>jms</module>
         <module>jmx</module>
@@ -24,6 +26,7 @@
         <module>quote</module>
         <module>sftp</module>
         <module>tcp-client-server</module>
+        <module>testing-examples</module>
         <module>twitter</module>
         <module>ws-inbound-gateway</module>
         <module>ws-outbound-gateway</module>
diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml
index a1c88ed7..8229d675 100644
--- a/basic/quote/pom.xml
+++ b/basic/quote/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>quote</artifactId>
-	<name>Spring Integration Quote Sample</name>
-	<version>2.0.0</version>	
+	<name>Samples (Basic) - Quote Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>	
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml
index 86f05b59..fd777086 100644
--- a/basic/sftp/pom.xml
+++ b/basic/sftp/pom.xml
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>sftp</artifactId>
-	<version>2.0.0</version>
-	<name>SFTP Demo</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Samples (Basic) - SFTP Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.M1</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml
index 8e4ad324..e5e881ce 100644
--- a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml
+++ b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml
@@ -5,11 +5,11 @@
 	xmlns:int-sftp="http://www.springframework.org/schema/integration/sftp"
 	xmlns:task="http://www.springframework.org/schema/task"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/integration/sftp http://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/integration/sftp http://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd">
 
 	<context:property-placeholder location="classpath:user.properties"/>
 
diff --git a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundGatewaySample-context.xml b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundGatewaySample-context.xml
index 9ef3195b..bef29176 100644
--- a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundGatewaySample-context.xml
+++ b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundGatewaySample-context.xml
@@ -6,8 +6,8 @@
 	xmlns:int-sftp="http://www.springframework.org/schema/integration/sftp"
 	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/integration/sftp http://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+		http://www.springframework.org/schema/integration/sftp http://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<context:property-placeholder location="classpath:user.properties"/>
 
diff --git a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml
index e04b673d..afb80682 100644
--- a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml
+++ b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml
@@ -4,10 +4,10 @@
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-sftp="http://www.springframework.org/schema/integration/sftp"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/integration/sftp http://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/integration/sftp http://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd">
 
 	<context:property-placeholder location="classpath:user.properties"/>
 	
diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml
index 937c82a2..fb771b77 100644
--- a/basic/tcp-client-server/pom.xml
+++ b/basic/tcp-client-server/pom.xml
@@ -4,14 +4,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>tcp-client-server</artifactId>
-	<version>2.0.0</version>	
-	<name>Spring Integration TCP Client Server Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<name>Samples (Basic) - TCP Client Server Sample</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.version>3.0.5.RELEASE</spring.version>
-		<spring.integration.version>2.0.4.BUILD-SNAPSHOT</spring.integration.version>
+		<spring.version>3.0.6.RELEASE</spring.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/basic/testing-examples/.project b/basic/testing-examples/.project
index 7f1a9d1c..c58f7f82 100644
--- a/basic/testing-examples/.project
+++ b/basic/testing-examples/.project
@@ -16,20 +16,14 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml
index 7f48448a..ea0c28d4 100644
--- a/basic/testing-examples/pom.xml
+++ b/basic/testing-examples/pom.xml
@@ -4,14 +4,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>testing-examples</artifactId>
-	<version>2.0.0</version>	
-	<name>Spring Integration Testing Examples</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<name>Samples (Basic) - Testing Examples</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
-		<spring.version>3.0.5.RELEASE</spring.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+		<spring.version>3.0.6.RELEASE</spring.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/basic/testing-examples/src/main/resources/META-INF/spring/integration/04-externalgateway/main-integration-context.xml b/basic/testing-examples/src/main/resources/META-INF/spring/integration/04-externalgateway/main-integration-context.xml
index 9acbcfda..784a8af5 100644
--- a/basic/testing-examples/src/main/resources/META-INF/spring/integration/04-externalgateway/main-integration-context.xml
+++ b/basic/testing-examples/src/main/resources/META-INF/spring/integration/04-externalgateway/main-integration-context.xml
@@ -4,7 +4,7 @@
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:task="http://www.springframework.org/schema/task"
 	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<gateway id="wat" 
diff --git a/basic/testing-examples/src/main/resources/META-INF/spring/integration/04-externalgateway/real-gateways.xml b/basic/testing-examples/src/main/resources/META-INF/spring/integration/04-externalgateway/real-gateways.xml
index cf229cf3..1638dfab 100644
--- a/basic/testing-examples/src/main/resources/META-INF/spring/integration/04-externalgateway/real-gateways.xml
+++ b/basic/testing-examples/src/main/resources/META-INF/spring/integration/04-externalgateway/real-gateways.xml
@@ -6,12 +6,12 @@
 	xmlns:int-http="http://www.springframework.org/schema/integration/http"
 	xmlns:int-mail="http://www.springframework.org/schema/integration/mail"
 	xmlns:int-ws="http://www.springframework.org/schema/integration/ws"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http-2.0.xsd
-		http://www.springframework.org/schema/integration/ws http://www.springframework.org/schema/integration/ws/spring-integration-ws-2.0.xsd
-		http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail-2.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd
+		http://www.springframework.org/schema/integration/ws http://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd
+		http://www.springframework.org/schema/integration/mail http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 	
     <int-http:outbound-gateway id="trafficService" 
 	                  url="http://local.yahooapis.com/MapsService/V1/trafficData?appid=YdnDemo&amp;zip={zipCode}" 
diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml
index 3335ac06..a57acf45 100644
--- a/basic/twitter/pom.xml
+++ b/basic/twitter/pom.xml
@@ -2,13 +2,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.integration.samples</groupId>
   <artifactId>twitter</artifactId>
-	<version>2.0.0</version>
-	<name>Twitter Demo</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Samples (Basic) - Twitter Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSearch-context.xml b/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSearch-context.xml
index be6fcf9f..31d4aebb 100644
--- a/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSearch-context.xml
+++ b/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSearch-context.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter-2.0.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-twitter="http://www.springframework.org/schema/integration/twitter">
diff --git a/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSendUpdates-context.xml b/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSendUpdates-context.xml
index 7da627da..e9a5c55f 100644
--- a/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSendUpdates-context.xml
+++ b/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSendUpdates-context.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter-2.0.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-twitter="http://www.springframework.org/schema/integration/twitter">
diff --git a/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterTimelineUpdates-context.xml b/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterTimelineUpdates-context.xml
index d6e402cd..8a44dbda 100644
--- a/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterTimelineUpdates-context.xml
+++ b/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterTimelineUpdates-context.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter-2.0.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-twitter="http://www.springframework.org/schema/integration/twitter">
diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml
index 8b4b6a33..5bf129bd 100644
--- a/basic/ws-inbound-gateway/pom.xml
+++ b/basic/ws-inbound-gateway/pom.xml
@@ -4,14 +4,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>ws-inbound-gateway</artifactId>
-	<name>Spring Integration WS Inbound Gateway Sample</name>
-	<version>2.0.0</version>	
+	<name>Samples (Basic) - WS Inbound Gateway Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>	
 	<packaging>war</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
-		<spring.version>3.0.5.RELEASE</spring.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+		<spring.version>3.1.0.RELEASE</spring.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/basic/ws-inbound-gateway/src/main/resources/META-INF/spring/integration/inbound-gateway-config.xml b/basic/ws-inbound-gateway/src/main/resources/META-INF/spring/integration/inbound-gateway-config.xml
index 8c0644df..1a8de547 100644
--- a/basic/ws-inbound-gateway/src/main/resources/META-INF/spring/integration/inbound-gateway-config.xml
+++ b/basic/ws-inbound-gateway/src/main/resources/META-INF/spring/integration/inbound-gateway-config.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-ws="http://www.springframework.org/schema/integration/ws"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration/ws http://www.springframework.org/schema/integration/ws/spring-integration-ws-2.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/integration/ws http://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<int:channel id="input"/>
 	
diff --git a/basic/ws-inbound-gateway/src/main/webapp/WEB-INF/spring-ws-config.xml b/basic/ws-inbound-gateway/src/main/webapp/WEB-INF/spring-ws-config.xml
index ee7678bd..07d77c1c 100644
--- a/basic/ws-inbound-gateway/src/main/webapp/WEB-INF/spring-ws-config.xml
+++ b/basic/ws-inbound-gateway/src/main/webapp/WEB-INF/spring-ws-config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<import resource="classpath:/META-INF/spring/integration/inbound-gateway-config.xml"/>
 
diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml
index 55ca5f21..b76f2288 100644
--- a/basic/ws-outbound-gateway/pom.xml
+++ b/basic/ws-outbound-gateway/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>ws-outbound-gateway</artifactId>
-	<name>Spring Integration WS Outbound Gateway Sample</name>
-	<version>2.0.0</version>
+	<name>Samples (Basic) - WS Outbound Gateway Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 		<saaj.version>1.3</saaj.version>
 		<javax-activation.version>1.1.1</javax-activation.version>
 	</properties>
diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml
index 8f746479..e608afb4 100644
--- a/basic/xml/pom.xml
+++ b/basic/xml/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>xml</artifactId>
-	<name>Spring Integration XML Sample</name>
-	<version>2.0.0</version>
+	<name>Samples (Basic) - XML Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/basic/xml/src/main/resources/META-INF/spring/integration/orderProcessingSample.xml b/basic/xml/src/main/resources/META-INF/spring/integration/orderProcessingSample.xml
index 9101de97..922e3209 100644
--- a/basic/xml/src/main/resources/META-INF/spring/integration/orderProcessingSample.xml
+++ b/basic/xml/src/main/resources/META-INF/spring/integration/orderProcessingSample.xml
@@ -6,9 +6,9 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/xml
-			http://www.springframework.org/schema/integration/xml/spring-integration-xml-2.0.xsd
+			http://www.springframework.org/schema/integration/xml/spring-integration-xml.xsd
 			http://www.springframework.org/schema/util
 			http://www.springframework.org/schema/util/spring-util.xsd">
 
diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml
index e31fe6f5..f5a49921 100644
--- a/basic/xmpp/pom.xml
+++ b/basic/xmpp/pom.xml
@@ -2,13 +2,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.integration.samples</groupId>
  <artifactId>xmpp</artifactId>
-	<version>2.0.0</version>
-	<name>XMPP Demo</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Samples (Basic) - XMPP Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/basic/xmpp/src/test/resources/META-INF/spring/integration/ReceiveInstantMessageSample-context.xml b/basic/xmpp/src/test/resources/META-INF/spring/integration/ReceiveInstantMessageSample-context.xml
index e7a6f3d5..82e9f2c6 100644
--- a/basic/xmpp/src/test/resources/META-INF/spring/integration/ReceiveInstantMessageSample-context.xml
+++ b/basic/xmpp/src/test/resources/META-INF/spring/integration/ReceiveInstantMessageSample-context.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/xmpp http://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-2.0.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/xmpp http://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-xmpp="http://www.springframework.org/schema/integration/xmpp">
diff --git a/basic/xmpp/src/test/resources/META-INF/spring/integration/SendInstantMessageSample-context.xml b/basic/xmpp/src/test/resources/META-INF/spring/integration/SendInstantMessageSample-context.xml
index 088f2321..a15b4d66 100644
--- a/basic/xmpp/src/test/resources/META-INF/spring/integration/SendInstantMessageSample-context.xml
+++ b/basic/xmpp/src/test/resources/META-INF/spring/integration/SendInstantMessageSample-context.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/xmpp http://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp-2.0.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/xmpp http://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-xmpp="http://www.springframework.org/schema/integration/xmpp">
diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml
index 94e21c95..7530769b 100644
--- a/intermediate/async-gateway/pom.xml
+++ b/intermediate/async-gateway/pom.xml
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>async-gateway</artifactId>
-	<version>2.0.0</version>
-	<name>Async Gateway Demo</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Samples (Intermediate) - Async Gateway Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/intermediate/async-gateway/src/main/resources/META-INF/spring/integration/math-service-config.xml b/intermediate/async-gateway/src/main/resources/META-INF/spring/integration/math-service-config.xml
index e56940ca..75f3e3b3 100644
--- a/intermediate/async-gateway/src/main/resources/META-INF/spring/integration/math-service-config.xml
+++ b/intermediate/async-gateway/src/main/resources/META-INF/spring/integration/math-service-config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:task="http://www.springframework.org/schema/task">
diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml
index 1066d3df..44fc73a8 100644
--- a/intermediate/errorhandling/pom.xml
+++ b/intermediate/errorhandling/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>errorhandling</artifactId>
-	<name>Spring Integration Error Handling Sample</name>
-	<version>2.0.0</version>
+	<name>Samples (Intermediate) - Error Handling Sample</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml
index e6d10d63..e6d187c5 100644
--- a/intermediate/file-processing/pom.xml
+++ b/intermediate/file-processing/pom.xml
@@ -2,11 +2,11 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>orf.springframework.integration.samples</groupId>
   <artifactId>file-processing</artifactId>
-  <version>2.0.0</version>
+  <version>2.1.0.BUILD-SNAPSHOT</version>
 <properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
+		<junit.version>4.10</junit.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -58,4 +58,5 @@
 			<url>http://maven.springframework.org/snapshot</url>
 		</repository>
 	</repositories>
+	<name>Samples (Intermediate) - File Processing</name>
 </project>
\ No newline at end of file
diff --git a/intermediate/file-processing/src/main/resources/META-INF/spring/integration/concurrentFileProcessing-config.xml b/intermediate/file-processing/src/main/resources/META-INF/spring/integration/concurrentFileProcessing-config.xml
index f713cee7..4d73df8c 100644
--- a/intermediate/file-processing/src/main/resources/META-INF/spring/integration/concurrentFileProcessing-config.xml
+++ b/intermediate/file-processing/src/main/resources/META-INF/spring/integration/concurrentFileProcessing-config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-2.0.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-file="http://www.springframework.org/schema/integration/file"
 	xmlns:task="http://www.springframework.org/schema/task">
diff --git a/intermediate/file-processing/src/main/resources/META-INF/spring/integration/sequentialFileProcessing-config.xml b/intermediate/file-processing/src/main/resources/META-INF/spring/integration/sequentialFileProcessing-config.xml
index fa30e74d..82792b1f 100644
--- a/intermediate/file-processing/src/main/resources/META-INF/spring/integration/sequentialFileProcessing-config.xml
+++ b/intermediate/file-processing/src/main/resources/META-INF/spring/integration/sequentialFileProcessing-config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-2.0.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-file="http://www.springframework.org/schema/integration/file"
 	xmlns:task="http://www.springframework.org/schema/task">
diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml
index 2437b5b7..2d354d86 100644
--- a/intermediate/multipart-http/pom.xml
+++ b/intermediate/multipart-http/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>multipart-http</artifactId>
-	<version>2.0.0</version>
-	<name>Spring Integration HTTP Multipart Demo</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Samples (Intermediate) - HTTP Multipart Demo</name>
 	<packaging>war</packaging>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
-		<spring.version>3.0.5.RELEASE</spring.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+		<spring.version>3.1.0.RELEASE</spring.version>
 		<commons-fileupload>1.2</commons-fileupload>
 		<commons-io>1.3.2</commons-io>
 		<log4j.version>1.2.16</log4j.version>
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.4.3</version>
+			<version>1.9.2</version>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
diff --git a/intermediate/multipart-http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml b/intermediate/multipart-http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml
index 1d9a830a..c126081c 100644
--- a/intermediate/multipart-http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml
+++ b/intermediate/multipart-http/src/main/resources/META-INF/spring/integration/http-outbound-config.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-http="http://www.springframework.org/schema/integration/http"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd">
 
 	<int:gateway id="requestGateway" 
 	             service-interface="org.springframework.integration.samples.multipart.MultipartRequestGateway"
diff --git a/intermediate/multipart-http/src/main/webapp/WEB-INF/servlet-config.xml b/intermediate/multipart-http/src/main/webapp/WEB-INF/servlet-config.xml
index b8e3b9e0..ffa344a2 100644
--- a/intermediate/multipart-http/src/main/webapp/WEB-INF/servlet-config.xml
+++ b/intermediate/multipart-http/src/main/webapp/WEB-INF/servlet-config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
-		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-2.0.xsd
-		http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http-2.0.xsd"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd
+		http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-file="http://www.springframework.org/schema/integration/file"
 	xmlns:int-http="http://www.springframework.org/schema/integration/http">
diff --git a/intermediate/pom.xml b/intermediate/pom.xml
index 400acb90..35fc2373 100644
--- a/intermediate/pom.xml
+++ b/intermediate/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.integration.samples</groupId>
 	<artifactId>intermediate-samples</artifactId>
-	<version>2.0.0</version>
-	<name>Intermediate Spring Integration Samples</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<name>Spring Integration Samples - Intermediate</name>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml
index 73565810..4584aab5 100644
--- a/intermediate/stored-procedures-derby/pom.xml
+++ b/intermediate/stored-procedures-derby/pom.xml
@@ -4,26 +4,36 @@
 
     <groupId>org.springframework.integration.samples</groupId>
     <artifactId>derby-stored-procedures</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>2.1.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>stored-procedures-derby</name>
+    <name>Samples (Intermediate) - Stored Procedures Derby</name>
     <url>http://www.springsource.org/spring-integration</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.integration.version>2.1.0.BUILD-SNAPSHOT</spring.integration.version>
-        <slf4j.version>1.6.1</slf4j.version>
-        <junit.version>4.7</junit.version>
+        <spring.integration.version>2.1.0.RC1</spring.integration.version>
+        <slf4j.version>1.6.4</slf4j.version>
+        <junit.version>4.10</junit.version>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>repository.springframework.maven.release</id>
-            <name>Spring Framework Maven Release Repository</name>
-            <url>http://maven.springframework.org/release</url>
-        </repository>
-    </repositories>
+	<repositories>
+		<repository>
+			<id>repository.springframework.maven.release</id>
+			<name>Spring Framework Maven Release Repository</name>
+			<url>http://maven.springframework.org/release</url>
+		</repository>
+		<repository>
+			<id>repository.springframework.maven.milestone</id>
+			<name>Spring Framework Maven Milestone Repository</name>
+			<url>http://maven.springframework.org/milestone</url>
+		</repository>
+		<repository>
+			<id>repository.springframework.maven.snapshot</id>
+			<name>Spring Framework Maven Snapshot Repository</name>
+			<url>http://maven.springframework.org/snapshot</url>
+		</repository>
+	</repositories>
 
     <build>
         <plugins>
@@ -94,7 +104,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>0.9.28</version>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
index cc7ffcf6..6bfab703 100644
--- a/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
+++ b/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
@@ -4,7 +4,7 @@
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-jdbc="http://www.springframework.org/schema/integration/jdbc"
 	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml
index 3a885698..2e92fce2 100644
--- a/intermediate/stored-procedures-oracle/pom.xml
+++ b/intermediate/stored-procedures-oracle/pom.xml
@@ -4,17 +4,17 @@
 
     <groupId>org.springframework.integration.samples</groupId>
     <artifactId>oracle-stored-procedures</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>2.1.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>stored-procedures-oracle</name>
+    <name>Samples (Intermediate) - Stored Procedures Oracle</name>
     <url>http://www.springsource.org/spring-integration</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.integration.version>2.1.0.BUILD-SNAPSHOT</spring.integration.version>
-        <slf4j.version>1.6.1</slf4j.version>
-        <junit.version>4.7</junit.version>
+        <spring.integration.version>2.1.0.RC1</spring.integration.version>
+        <slf4j.version>1.6.4</slf4j.version>
+        <junit.version>4.10</junit.version>
     </properties>
 
     <repositories>
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>0.9.28</version>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml
index 70b089d6..cbb7d8bd 100644
--- a/intermediate/travel/pom.xml
+++ b/intermediate/travel/pom.xml
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>travel</artifactId>
-	<name>Spring Integration Travel Services Sample</name>
-	<version>2.0.0</version>
+	<name>Samples (Intermediate) - Travel Services</name>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<properties>
-		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
+		<spring.integration.version>2.1.0.RC1</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
-		<junit.version>4.7</junit.version>
-		<spring.version>3.0.5.RELEASE</spring.version>
+		<junit.version>4.10</junit.version>
+		<spring.version>3.1.0.RELEASE</spring.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/intermediate/travel/src/main/resources/META-INF/spring/integration-context.xml b/intermediate/travel/src/main/resources/META-INF/spring/integration-context.xml
index 1e5e585e..a39649c4 100644
--- a/intermediate/travel/src/main/resources/META-INF/spring/integration-context.xml
+++ b/intermediate/travel/src/main/resources/META-INF/spring/integration-context.xml
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd">
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
 	
 	<gateway id="travelGateway" 
 	             service-interface="org.springframework.integration.samples.travel.TravelGateway" 
diff --git a/intermediate/travel/src/main/resources/META-INF/spring/integration-http-context.xml b/intermediate/travel/src/main/resources/META-INF/spring/integration-http-context.xml
index adeeecc0..9b0a1aa3 100644
--- a/intermediate/travel/src/main/resources/META-INF/spring/integration-http-context.xml
+++ b/intermediate/travel/src/main/resources/META-INF/spring/integration-http-context.xml
@@ -4,8 +4,8 @@
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http-2.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd">
+		http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
 	
 	<outbound-gateway id="trafficGateway" 
 	                  url="http://local.yahooapis.com/MapsService/V1/trafficData?appid=YdnDemo&amp;zip={zipCode}" 
diff --git a/intermediate/travel/src/main/resources/META-INF/spring/integration-ws-context.xml b/intermediate/travel/src/main/resources/META-INF/spring/integration-ws-context.xml
index a4da31f0..a9c90e5e 100644
--- a/intermediate/travel/src/main/resources/META-INF/spring/integration-ws-context.xml
+++ b/intermediate/travel/src/main/resources/META-INF/spring/integration-ws-context.xml
@@ -3,8 +3,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/integration/ws http://www.springframework.org/schema/integration/ws/spring-integration-ws-2.0.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd">
+		http://www.springframework.org/schema/integration/ws http://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<header-enricher input-channel="weatherChannel" output-channel="weatherServiceChannel">
 		<soap-action value="http://ws.cdyne.com/WeatherWS/GetCityWeatherByZIP" />
diff --git a/pom.xml b/pom.xml
index b22bb94f..4c441bd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>samples-root</artifactId>
-	<version>2.0.0</version>
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<name>Spring Integration Samples Root</name>
 	<packaging>pom</packaging>