diff --git a/applications/cafe/.classpath b/applications/cafe/.classpath
index 6d3fb35a..dd384e4f 100644
--- a/applications/cafe/.classpath
+++ b/applications/cafe/.classpath
@@ -3,7 +3,7 @@
 	<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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml
index 679e90fe..aa0dbf58 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</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 67883136..9241e358 100644
--- a/applications/loan-broker/.classpath
+++ b/applications/loan-broker/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<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.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml
index 065d9f85..7d6f928e 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</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 83f2701d..5c0ef607 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.3.RELEASE</version>
+            <version>2.0.5.RELEASE</version>
         </dependency>
     </dependencies>
 	<build>
diff --git a/basic/control-bus/.classpath b/basic/control-bus/.classpath
index 96489ff1..2e2b757d 100644
--- a/basic/control-bus/.classpath
+++ b/basic/control-bus/.classpath
@@ -4,7 +4,7 @@
 	<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.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml
index d782532e..46965739 100644
--- a/basic/control-bus/pom.xml
+++ b/basic/control-bus/pom.xml
@@ -8,7 +8,7 @@
 	<name>Spring Integration Hello World Sample</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/feed/.classpath b/basic/feed/.classpath
index caf88e10..9fcb3c05 100644
--- a/basic/feed/.classpath
+++ b/basic/feed/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<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.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml
index 17f77258..9df267b0 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/file/.classpath b/basic/file/.classpath
index dde3100b..3a8350c2 100644
--- a/basic/file/.classpath
+++ b/basic/file/.classpath
@@ -4,7 +4,7 @@
 	<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.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/file/pom.xml b/basic/file/pom.xml
index 138bb834..c562776d 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.2.BUILD-SNAPSHOT</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/ftp/.classpath b/basic/ftp/.classpath
index caf88e10..9fcb3c05 100644
--- a/basic/ftp/.classpath
+++ b/basic/ftp/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<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.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml
index cb6914a6..354d3d15 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</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 9fdc701a..96540801 100644
--- a/basic/helloworld/.classpath
+++ b/basic/helloworld/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml
index c0e69772..4f765020 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/http/.classpath b/basic/http/.classpath
index 3ebbe5d5..24d86769 100644
--- a/basic/http/.classpath
+++ b/basic/http/.classpath
@@ -3,7 +3,7 @@
 	<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 kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
diff --git a/basic/http/pom.xml b/basic/http/pom.xml
index d7f96bc3..9ec59b9d 100644
--- a/basic/http/pom.xml
+++ b/basic/http/pom.xml
@@ -7,7 +7,7 @@
 	<name>Spring Integration HTTP Demo</name>
 	<packaging>war</packaging>
 	<properties>
-		<spring.integration.version>2.0.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</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/basic/jms/.classpath b/basic/jms/.classpath
index dde3100b..3a8350c2 100644
--- a/basic/jms/.classpath
+++ b/basic/jms/.classpath
@@ -4,7 +4,7 @@
 	<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.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/jms/.springBeans b/basic/jms/.springBeans
index 915bb7ad..99b84d84 100644
--- a/basic/jms/.springBeans
+++ b/basic/jms/.springBeans
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.5.1.201011101000-RELEASE]]></pluginVersion>
+	<pluginVersion><![CDATA[2.6.0.201104111100-PATCH]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
@@ -12,6 +12,7 @@
 		<config>src/main/resources/META-INF/spring/integration/inboundGateway.xml</config>
 		<config>src/main/resources/META-INF/spring/integration/outboundChannelAdapter.xml</config>
 		<config>src/main/resources/META-INF/spring/integration/outboundGateway.xml</config>
+		<config>src/main/resources/META-INF/spring/integration/joris-config.xml</config>
 	</configs>
 	<configSets>
 	</configSets>
diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml
index 69b0ea54..153136d2 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
 		<activemq.version>5.2.0</activemq.version>
 	</properties>
 	<dependencies>
@@ -17,9 +17,20 @@
 			<artifactId>activemq-core</artifactId>
 			<version>${activemq.version}</version>
 		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.springframework.integration</groupId> -->
+<!-- 			<artifactId>spring-integration-jms</artifactId> -->
+<!-- 			<version>${spring.integration.version}</version> -->
+<!-- 		</dependency> -->
+ <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jms</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-jms</artifactId>
+			<artifactId>spring-integration-core</artifactId>
 			<version>${spring.integration.version}</version>
 		</dependency>
 		<dependency>
diff --git a/basic/jmx/.classpath b/basic/jmx/.classpath
index 6331965e..e10080ad 100644
--- a/basic/jmx/.classpath
+++ b/basic/jmx/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml
index d5ca24e2..8aa8f732 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</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 b7b1a75a..7343643a 100644
--- a/basic/mail/.classpath
+++ b/basic/mail/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<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"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml
index 821432b8..10a5e2c5 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</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 9fdc701a..96540801 100644
--- a/basic/oddeven/.classpath
+++ b/basic/oddeven/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml
index d21e5a2a..a327caba 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/quote/.classpath b/basic/quote/.classpath
index 0ce7eaab..3a0192be 100644
--- a/basic/quote/.classpath
+++ b/basic/quote/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" 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.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml
index d7e58077..a1c88ed7 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/sftp/.classpath b/basic/sftp/.classpath
index caf88e10..9fcb3c05 100644
--- a/basic/sftp/.classpath
+++ b/basic/sftp/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<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.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml
index 1b04d219..b181b351 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/tcp-client-server/.classpath b/basic/tcp-client-server/.classpath
index dde3100b..3a8350c2 100644
--- a/basic/tcp-client-server/.classpath
+++ b/basic/tcp-client-server/.classpath
@@ -4,7 +4,7 @@
 	<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.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml
index 92b6e888..937c82a2 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.4.BUILD-SNAPSHOT</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/testing-examples/.classpath b/basic/testing-examples/.classpath
index da16818b..a9146e7a 100644
--- a/basic/testing-examples/.classpath
+++ b/basic/testing-examples/.classpath
@@ -3,7 +3,7 @@
 	<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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml
index a3e05b10..b744af93 100644
--- a/basic/testing-examples/pom.xml
+++ b/basic/testing-examples/pom.xml
@@ -8,7 +8,7 @@
 	<name>Spring Integration Testing Examples</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.0.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</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/twitter/.classpath b/basic/twitter/.classpath
index caf88e10..9fcb3c05 100644
--- a/basic/twitter/.classpath
+++ b/basic/twitter/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<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.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml
index 20d65ecb..3335ac06 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</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 f16b661b..8b4b6a33 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</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 e000b381..c16585b7 100644
--- a/basic/ws-outbound-gateway/.classpath
+++ b/basic/ws-outbound-gateway/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml
index 26a52609..55ca5f21 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</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 9fdc701a..96540801 100644
--- a/basic/xml/.classpath
+++ b/basic/xml/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml
index 1e581d6a..8f746479 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/basic/xmpp/.classpath b/basic/xmpp/.classpath
index caf88e10..9fcb3c05 100644
--- a/basic/xmpp/.classpath
+++ b/basic/xmpp/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<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.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml
index e38c216f..e31fe6f5 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/intermediate/async-gateway/.classpath b/intermediate/async-gateway/.classpath
index a9b8d563..7411fdc9 100644
--- a/intermediate/async-gateway/.classpath
+++ b/intermediate/async-gateway/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml
index f8a8b069..94e21c95 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/intermediate/errorhandling/.classpath b/intermediate/errorhandling/.classpath
index 0ce7eaab..3a0192be 100644
--- a/intermediate/errorhandling/.classpath
+++ b/intermediate/errorhandling/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" 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.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml
index e5237447..1066d3df 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/intermediate/file-processing/.classpath b/intermediate/file-processing/.classpath
index 96489ff1..2e2b757d 100644
--- a/intermediate/file-processing/.classpath
+++ b/intermediate/file-processing/.classpath
@@ -4,7 +4,7 @@
 	<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.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml
index b7470b68..e6d10d63 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 	</properties>
diff --git a/intermediate/multipart-http/.classpath b/intermediate/multipart-http/.classpath
index 90680aeb..97cadcc2 100644
--- a/intermediate/multipart-http/.classpath
+++ b/intermediate/multipart-http/.classpath
@@ -10,7 +10,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml
index edf98b77..2437b5b7 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
 		<spring.version>3.0.5.RELEASE</spring.version>
 		<commons-fileupload>1.2</commons-fileupload>
 		<commons-io>1.3.2</commons-io>
@@ -19,6 +19,23 @@
 			<artifactId>spring-integration-http</artifactId>
 			<version>${spring.integration.version}</version>
 		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.codehaus.jackson</groupId> -->
+<!-- 			<artifactId>jackson-core-asl</artifactId> -->
+<!-- 			<version>1.8.1</version> -->
+<!-- 		</dependency> -->
+		<dependency>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-mapper-asl</artifactId>
+			<version>1.4.3</version>
+			<scope>compile</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-core</artifactId>
+			<version>${spring.integration.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
@@ -55,7 +72,7 @@
 			</plugin>
 		</plugins>
 	</build>
-		<repositories>
+	<repositories>
 		<repository>
 			<id>repository.springframework.maven.release</id>
 			<name>Spring Framework Maven Release Repository</name>
diff --git a/intermediate/travel/.classpath b/intermediate/travel/.classpath
index 96489ff1..2e2b757d 100644
--- a/intermediate/travel/.classpath
+++ b/intermediate/travel/.classpath
@@ -4,7 +4,7 @@
 	<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.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml
index 616af883..70b089d6 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.3.RELEASE</spring.integration.version>
+		<spring.integration.version>2.0.5.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.7</junit.version>
 		<spring.version>3.0.5.RELEASE</spring.version>