diff --git a/applications/cafe/.classpath b/applications/cafe/.classpath
index 1fd94e6d..6d3fb35a 100644
--- a/applications/cafe/.classpath
+++ b/applications/cafe/.classpath
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml
index 5320c20c..54b23d6d 100644
--- a/applications/cafe/pom.xml
+++ b/applications/cafe/pom.xml
@@ -7,7 +7,7 @@
 	<version>2.0.0</version>
 	<name>Spring Integration Cafe Sample</name>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/applications/loan-broker/.classpath b/applications/loan-broker/.classpath
index 96489ff1..67883136 100644
--- a/applications/loan-broker/.classpath
+++ b/applications/loan-broker/.classpath
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml
index 6b373a5b..530166d7 100644
--- a/applications/loan-broker/pom.xml
+++ b/applications/loan-broker/pom.xml
@@ -7,7 +7,7 @@
 	<version>2.0.0</version>
 	<name>Spring Integration Loan Broker Sample</name>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</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>
diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml
index 51fb4aa1..f9ddae13 100644
--- a/applications/loanshark/pom.xml
+++ b/applications/loanshark/pom.xml
@@ -361,7 +361,7 @@
     <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-ip</artifactId>
-            <version>2.0.0.RELEASE</version>
+            <version>2.0.2.BUILD-SNAPSHOT</version>
         </dependency>
     </dependencies>
 	<build>
diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml
index 2da56046..1543e75c 100644
--- a/basic/feed/pom.xml
+++ b/basic/feed/pom.xml
@@ -6,7 +6,7 @@
 	<name>Feed Demo (RSS/ATOM)</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/file/pom.xml b/basic/file/pom.xml
index d3c1fb91..138bb834 100644
--- a/basic/file/pom.xml
+++ b/basic/file/pom.xml
@@ -8,7 +8,7 @@
 	<name>Spring Integration File Copy Sample</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml
index b8519e2a..9efd287d 100644
--- a/basic/ftp/pom.xml
+++ b/basic/ftp/pom.xml
@@ -6,7 +6,7 @@
 	<name>FTP Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/helloworld/.classpath b/basic/helloworld/.classpath
index dde3100b..9fdc701a 100644
--- a/basic/helloworld/.classpath
+++ b/basic/helloworld/.classpath
@@ -2,8 +2,6 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml
index ac6beb22..746c713f 100644
--- a/basic/helloworld/pom.xml
+++ b/basic/helloworld/pom.xml
@@ -8,7 +8,7 @@
 	<name>Spring Integration Hello World Sample</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml
index 6ab6dda6..b09b19a8 100644
--- a/basic/jms/pom.xml
+++ b/basic/jms/pom.xml
@@ -8,7 +8,7 @@
 	<name>Spring Integration JMS Sample</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<activemq.version>5.2.0</activemq.version>
 	</properties>
 	<dependencies>
diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml
index 04373dac..5c71a843 100644
--- a/basic/jmx/pom.xml
+++ b/basic/jmx/pom.xml
@@ -8,7 +8,7 @@
 	<version>2.0.0</version>	
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/mail/.classpath b/basic/mail/.classpath
index e795a3c4..b7b1a75a 100644
--- a/basic/mail/.classpath
+++ b/basic/mail/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml
index 25745414..fe04e4c8 100644
--- a/basic/mail/pom.xml
+++ b/basic/mail/pom.xml
@@ -6,7 +6,7 @@
 	<name>Spring Integration IMAP IDLE Sample</name>
 	<version>2.0.0</version>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/oddeven/.classpath b/basic/oddeven/.classpath
index dde3100b..9fdc701a 100644
--- a/basic/oddeven/.classpath
+++ b/basic/oddeven/.classpath
@@ -2,8 +2,6 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml
index 57c7a3ce..ab644702 100644
--- a/basic/oddeven/pom.xml
+++ b/basic/oddeven/pom.xml
@@ -8,7 +8,7 @@
 	<version>2.0.0</version>	
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml
index 474f2445..131708bd 100644
--- a/basic/quote/pom.xml
+++ b/basic/quote/pom.xml
@@ -8,7 +8,7 @@
 	<version>2.0.0</version>	
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml
index 07d55d72..d0be0f6a 100644
--- a/basic/sftp/pom.xml
+++ b/basic/sftp/pom.xml
@@ -7,7 +7,7 @@
 	<name>SFTP Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml
index dd9302ec..eda1117d 100644
--- a/basic/tcp-client-server/pom.xml
+++ b/basic/tcp-client-server/pom.xml
@@ -9,7 +9,7 @@
 	<packaging>jar</packaging>
 	<properties>
 		<spring.version>3.0.5.RELEASE</spring.version>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml
index 6139a518..07d41e8e 100644
--- a/basic/twitter/pom.xml
+++ b/basic/twitter/pom.xml
@@ -6,7 +6,7 @@
 	<name>Twitter Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml
index b92d2896..f86bc00b 100644
--- a/basic/ws-inbound-gateway/pom.xml
+++ b/basic/ws-inbound-gateway/pom.xml
@@ -8,7 +8,7 @@
 	<version>2.0.0</version>	
 	<packaging>war</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<spring.version>3.0.5.RELEASE</spring.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
diff --git a/basic/ws-outbound-gateway/.classpath b/basic/ws-outbound-gateway/.classpath
index fe380d13..e000b381 100644
--- a/basic/ws-outbound-gateway/.classpath
+++ b/basic/ws-outbound-gateway/.classpath
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src.test/resources"/>
-	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml
index fdc43d9e..59ff703d 100644
--- a/basic/ws-outbound-gateway/pom.xml
+++ b/basic/ws-outbound-gateway/pom.xml
@@ -8,7 +8,7 @@
 	<version>2.0.0</version>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 		<saaj.version>1.3</saaj.version>
diff --git a/basic/xml/.classpath b/basic/xml/.classpath
index dde3100b..9fdc701a 100644
--- a/basic/xml/.classpath
+++ b/basic/xml/.classpath
@@ -2,8 +2,6 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml
index 4c093899..5495d1ca 100644
--- a/basic/xml/pom.xml
+++ b/basic/xml/pom.xml
@@ -8,7 +8,7 @@
 	<version>2.0.0</version>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml
index 253e9354..fd1dee13 100644
--- a/basic/xmpp/pom.xml
+++ b/basic/xmpp/pom.xml
@@ -6,7 +6,7 @@
 	<name>XMPP Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml
index 198542f0..640bf979 100644
--- a/intermediate/async-gateway/pom.xml
+++ b/intermediate/async-gateway/pom.xml
@@ -7,7 +7,7 @@
 	<name>Async Gateway Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.BUILD-SNAPSHOT</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml
index b670d043..5eaba58d 100644
--- a/intermediate/errorhandling/pom.xml
+++ b/intermediate/errorhandling/pom.xml
@@ -7,7 +7,7 @@
 	<name>Spring Integration Error Handling Sample</name>
 	<version>2.0.0</version>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml
index 898f34db..704a2145 100644
--- a/intermediate/file-processing/pom.xml
+++ b/intermediate/file-processing/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>file-processing</artifactId>
   <version>2.0.0</version>
 <properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml
index 5ad18bb5..381819b0 100644
--- a/intermediate/multipart-http/pom.xml
+++ b/intermediate/multipart-http/pom.xml
@@ -7,7 +7,7 @@
 	<name>Spring Integration HTTP Multipart Demo</name>
 	<packaging>war</packaging>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<spring.version>3.0.5.RELEASE</spring.version>
 		<commons-fileupload>1.2</commons-fileupload>
 		<commons-io>1.3.2</commons-io>
diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml
index 8f6da110..6082f20b 100644
--- a/intermediate/travel/pom.xml
+++ b/intermediate/travel/pom.xml
@@ -6,7 +6,7 @@
 	<name>Spring Integration Travel Services Sample</name>
 	<version>2.0.0</version>
 	<properties>
-		<spring.integration.version>2.0.0.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.2.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 		<spring.version>3.0.5.RELEASE</spring.version>