diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml
index 325463b3..2d83eb9c 100644
--- a/advanced/advanced-testing-examples/pom.xml
+++ b/advanced/advanced-testing-examples/pom.xml
@@ -14,8 +14,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
-		<spring.version>3.1.3.RELEASE</spring.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
+		<spring.version>3.2.6.RELEASE</spring.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.11</junit.version>
 	</properties>
@@ -122,4 +122,4 @@
 			<url>https://repo.springsource.org/libs-milestone</url>
 		</repository>
 	</repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml
index fa3dd878..6a998c5c 100644
--- a/advanced/dynamic-ftp/pom.xml
+++ b/advanced/dynamic-ftp/pom.xml
@@ -8,7 +8,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.framework.version>3.1.3.RELEASE</spring.framework.version>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml
index 7da683fa..705b86de 100644
--- a/applications/cafe-scripted/pom.xml
+++ b/applications/cafe-scripted/pom.xml
@@ -8,8 +8,8 @@
 	<name>Samples (Applications) - Cafe Sample (Scripted Implementation)</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
-		<spring.version>3.1.3.RELEASE</spring.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
+		<spring.version>3.2.6.RELEASE</spring.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml
index 07f20bc4..15240deb 100644
--- a/applications/cafe/pom.xml
+++ b/applications/cafe/pom.xml
@@ -21,7 +21,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<spring.core.version>3.1.3.RELEASE</spring.core.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml
index 893d2ef7..3cb2f626 100644
--- a/applications/loan-broker/pom.xml
+++ b/applications/loan-broker/pom.xml
@@ -8,7 +8,7 @@
 	<name>Samples (Applications) - Loan Broker</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<commons-logging.version>1.1.1</commons-logging.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml
index 42579161..b25713a0 100644
--- a/applications/loanshark/pom.xml
+++ b/applications/loanshark/pom.xml
@@ -8,8 +8,8 @@
 	<packaging>war</packaging>
 	<properties>
 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	    <spring.integration.version>2.1.0.RELEASE</spring.integration.version>
-		<spring.version>3.1.0.RELEASE</spring.version>
+	    <spring.integration.version>3.0.0.RELEASE</spring.integration.version>
+		<spring.version>3.2.6.RELEASE</spring.version>
 		<aspectj.version>1.6.10</aspectj.version>
 		<slf4j.version>1.6.1</slf4j.version>
 	</properties>
diff --git a/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/TestAccumulator.java b/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java
similarity index 98%
rename from applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/TestAccumulator.java
rename to applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java
index bf2c19b5..1eff38b1 100644
--- a/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/TestAccumulator.java
+++ b/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java
@@ -36,11 +36,11 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @ContextConfiguration(locations="classpath:META-INF/spring/applicationContext.xml")
 @RunWith(SpringJUnit4ClassRunner.class)
-public class TestAccumulator {
+public class AccumulatorTests {
 
 	@Autowired
 	Accumulator accumulator;
-	
+
 	@Test
 	@Transactional
 	public void test() {
diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml
index 40c85614..eb64c838 100644
--- a/basic/amqp/pom.xml
+++ b/basic/amqp/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml
index 5fb5da25..0def9869 100644
--- a/basic/control-bus/pom.xml
+++ b/basic/control-bus/pom.xml
@@ -14,7 +14,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -59,4 +59,4 @@
 			<url>https://repo.springsource.org/libs-milestone</url>
 		</repository>
 	</repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml
index 50a0b322..b0a2c2b8 100644
--- a/basic/enricher/pom.xml
+++ b/basic/enricher/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml
index fba38130..fc3c4519 100644
--- a/basic/feed/pom.xml
+++ b/basic/feed/pom.xml
@@ -12,7 +12,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.0.RC2</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -57,4 +57,4 @@
 			<url>https://repo.springsource.org/libs-milestone</url>
 		</repository>
 	</repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/basic/file/pom.xml b/basic/file/pom.xml
index 7f1d589f..e44865a4 100644
--- a/basic/file/pom.xml
+++ b/basic/file/pom.xml
@@ -12,7 +12,7 @@
 	</prerequisites>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml
index 87cc6e79..0d8053fd 100644
--- a/basic/ftp/pom.xml
+++ b/basic/ftp/pom.xml
@@ -13,7 +13,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>3.0.0.M3</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml
index 98534e92..51c0946c 100644
--- a/basic/helloworld/pom.xml
+++ b/basic/helloworld/pom.xml
@@ -14,7 +14,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 		<java.main.class>org.springframework.integration.samples.helloworld.HelloWorldApp</java.main.class>
@@ -84,4 +84,4 @@
 			<url>https://repo.springsource.org/libs-milestone</url>
 		</repository>
 	</repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/basic/http/pom.xml b/basic/http/pom.xml
index a6d63ed4..12f5cb7b 100644
--- a/basic/http/pom.xml
+++ b/basic/http/pom.xml
@@ -13,8 +13,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
-		<spring.version>3.1.3.RELEASE</spring.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
+		<spring.version>3.2.6.RELEASE</spring.version>
 		<commons-fileupload>1.2.2</commons-fileupload>
 		<commons-io>1.3.2</commons-io>
 		<log4j.version>1.2.17</log4j.version>
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 503b5977..b4831c08 100644
--- a/basic/http/src/main/webapp/WEB-INF/servlet-config.xml
+++ b/basic/http/src/main/webapp/WEB-INF/servlet-config.xml
@@ -11,10 +11,10 @@
 	xmlns:int-mail="http://www.springframework.org/schema/integration/mail">
 
 	<int-http:inbound-gateway request-channel="receiveChannel"
-                          name="/receiveGateway"
+                          path="/receiveGateway"
                           supported-methods="POST"/>
-                          
-	<int:channel id="receiveChannel"/>	
-	
+
+	<int:channel id="receiveChannel"/>
+
 	<int:service-activator input-channel="receiveChannel" expression="payload + ' from the other side'"/>
 </beans>
diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml
index 3f1cc211..cff0ea64 100644
--- a/basic/jdbc/pom.xml
+++ b/basic/jdbc/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml
index b3f73991..fe4e9a48 100644
--- a/basic/jms/pom.xml
+++ b/basic/jms/pom.xml
@@ -14,7 +14,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<activemq.version>5.7.0</activemq.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml
index 8d6b45f0..06b90020 100644
--- a/basic/jmx/pom.xml
+++ b/basic/jmx/pom.xml
@@ -14,7 +14,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -64,4 +64,4 @@
 			<url>https://repo.springsource.org/libs-milestone</url>
 		</repository>
 	</repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml
index e01136fd..31c0adb9 100644
--- a/basic/jpa/pom.xml
+++ b/basic/jpa/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 		<openjpa.version>2.2.0</openjpa.version>
@@ -40,7 +40,7 @@
 		<repository>
 			<id>central</id>
 			<name>Maven Central</name>
-			<url>http://repo1.maven.org/maven2</url>
+			<url>http://repo1.maven.org/maven</url>
 		</repository>
 	</repositories>
 
diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml
index be1a9a59..946a6e86 100644
--- a/basic/mail/pom.xml
+++ b/basic/mail/pom.xml
@@ -12,7 +12,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -68,4 +68,4 @@
 			<url>https://repo.springsource.org/libs-milestone</url>
 		</repository>
 	</repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml
index 00987c56..3e842e0d 100644
--- a/basic/mongodb/pom.xml
+++ b/basic/mongodb/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml
index 62198c63..22906c9d 100644
--- a/basic/oddeven/pom.xml
+++ b/basic/oddeven/pom.xml
@@ -14,7 +14,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml
index e71c8202..73927b21 100644
--- a/basic/quote/pom.xml
+++ b/basic/quote/pom.xml
@@ -12,7 +12,7 @@
 	</prerequisites>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml
index 69c5944c..bffe8381 100644
--- a/basic/sftp/pom.xml
+++ b/basic/sftp/pom.xml
@@ -11,7 +11,7 @@
 	</prerequisites>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml
index 71c040f9..7f7fe830 100644
--- a/basic/tcp-amqp/pom.xml
+++ b/basic/tcp-amqp/pom.xml
@@ -17,7 +17,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.amqp.version>1.1.3.RELEASE</spring.amqp.version>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<slf4j.version>1.6.4</slf4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml
index bea2f2f6..6f84f0e9 100644
--- a/basic/tcp-client-server/pom.xml
+++ b/basic/tcp-client-server/pom.xml
@@ -12,8 +12,8 @@
 	</prerequisites>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.version>3.1.3.RELEASE</spring.version>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.version>3.2.6.RELEASE</spring.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 		<java.main.class>org.springframework.integration.samples.tcpclientserver.Main</java.main.class>
@@ -93,4 +93,4 @@
 			<url>https://repo.springsource.org/libs-milestone</url>
 		</repository>
 	</repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml
index b997e5c2..30e7b83e 100644
--- a/basic/testing-examples/pom.xml
+++ b/basic/testing-examples/pom.xml
@@ -12,8 +12,8 @@
 	</prerequisites>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
-		<spring.version>3.1.3.RELEASE</spring.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
+		<spring.version>3.2.6.RELEASE</spring.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml
index 10444927..17ab91e7 100644
--- a/basic/twitter/pom.xml
+++ b/basic/twitter/pom.xml
@@ -12,7 +12,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.4.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -57,4 +57,4 @@
 			<url>https://repo.springsource.org/libs-milestone</url>
 		</repository>
 	</repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml
index 0d3ab3de..9ab5723a 100644
--- a/basic/ws-inbound-gateway/pom.xml
+++ b/basic/ws-inbound-gateway/pom.xml
@@ -12,8 +12,8 @@
 	</prerequisites>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
-		<spring.version>3.1.3.RELEASE</spring.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
+		<spring.version>3.2.6.RELEASE</spring.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml
index a7e1a1bf..2d8d9e9f 100644
--- a/basic/ws-outbound-gateway/pom.xml
+++ b/basic/ws-outbound-gateway/pom.xml
@@ -12,7 +12,7 @@
 	</prerequisites>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 		<saaj.version>1.3.19</saaj.version>
@@ -82,4 +82,4 @@
 			<url>https://repo.springsource.org/libs-milestone</url>
 		</repository>
 	</repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml
index d5f4b677..bec9b776 100644
--- a/basic/xml/pom.xml
+++ b/basic/xml/pom.xml
@@ -12,7 +12,7 @@
 	</prerequisites>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -65,4 +65,4 @@
 			<url>https://repo.springsource.org/libs-milestone</url>
 		</repository>
 	</repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml
index a2a27b43..2a4b7e81 100644
--- a/basic/xmpp/pom.xml
+++ b/basic/xmpp/pom.xml
@@ -12,7 +12,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -57,4 +57,4 @@
 			<url>https://repo.springsource.org/libs-milestone</url>
 		</repository>
 	</repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml
index 0eaa2e36..b83011c6 100644
--- a/intermediate/async-gateway/pom.xml
+++ b/intermediate/async-gateway/pom.xml
@@ -13,7 +13,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml
index aa8e5b89..229202e6 100644
--- a/intermediate/dynamic-poller/pom.xml
+++ b/intermediate/dynamic-poller/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 		<java.main.class>org.springframework.integration.samples.poller.Main</java.main.class>
diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml
index 1e000d64..bd971d51 100644
--- a/intermediate/errorhandling/pom.xml
+++ b/intermediate/errorhandling/pom.xml
@@ -13,7 +13,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml
index 44985ef0..7f4483e4 100644
--- a/intermediate/file-processing/pom.xml
+++ b/intermediate/file-processing/pom.xml
@@ -7,7 +7,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -57,4 +57,4 @@
 			<url>https://repo.springsource.org/libs-milestone</url>
 		</repository>
 	</repositories>
-</project>
\ No newline at end of file
+</project>
diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml
index 74e51a49..4871f0dc 100644
--- a/intermediate/mail-attachments/pom.xml
+++ b/intermediate/mail-attachments/pom.xml
@@ -8,7 +8,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml
index b9908f4d..ce782d1a 100644
--- a/intermediate/monitoring/pom.xml
+++ b/intermediate/monitoring/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<org.springframework-version>3.1.3.RELEASE</org.springframework-version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml
index 576e74de..949df9e2 100644
--- a/intermediate/multipart-http/pom.xml
+++ b/intermediate/multipart-http/pom.xml
@@ -8,8 +8,8 @@
 	<packaging>war</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
-		<spring.version>3.1.3.RELEASE</spring.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
+		<spring.version>3.2.6.RELEASE</spring.version>
 		<commons-fileupload>1.2.2</commons-fileupload>
 		<commons-io>1.3.2</commons-io>
 		<log4j.version>1.2.17</log4j.version>
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 f27f8670..11d517c4 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
@@ -9,17 +9,17 @@
 	xmlns:int-file="http://www.springframework.org/schema/integration/file"
 	xmlns:int-http="http://www.springframework.org/schema/integration/http">
 
-	
-	<int-http:inbound-channel-adapter id="httpInboundAdapter" 
-									  channel="receiveChannel" 
-									  name="/inboundAdapter.htm" 
+
+	<int-http:inbound-channel-adapter id="httpInboundAdapter"
+									  channel="receiveChannel"
+									  path="/inboundAdapter.htm"
 									  supported-methods="GET, POST" />
-	
+
 	<int:channel id="receiveChannel"/>
-	
+
 	<int:service-activator id="multipartReceiver" input-channel="receiveChannel">
 		<bean class="org.springframework.integration.samples.multipart.MultipartReceiver"/>
 	</int:service-activator>
-	
+
 	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver"/>
 </beans>
diff --git a/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java
index fee91193..d9f23d95 100644
--- a/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java
+++ b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java
@@ -32,7 +32,7 @@ import org.springframework.web.client.RestTemplate;
  *
  */
 public class MultipartRestClient {
-	
+
 	private static Logger logger = Logger.getLogger(MultipartRestClient.class);
 	private static String uri = "http://localhost:8080/multipart-http/inboundAdapter.htm";
 	private static String resourcePath = "org/springframework/integration/samples/multipart/spring09_logo.png";
@@ -51,7 +51,7 @@ public class MultipartRestClient {
 		headers.setContentType(new MediaType("multipart", "form-data"));
 		HttpEntity<Object> request = new HttpEntity<Object>(multipartMap, headers);
 		logger.info("Posting request to: " + uri);
-		ResponseEntity<?> httpResponse = template.exchange(uri, HttpMethod.POST, request, null);
+		ResponseEntity<?> httpResponse = template.exchange(uri, HttpMethod.POST, request, Object.class);
 		if (!httpResponse.getStatusCode().equals(HttpStatus.OK)){
 			logger.error("Problems with the request. Http status: " + httpResponse.getStatusCode());
 		}
diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml
index ec0363b2..adbe0a0a 100644
--- a/intermediate/rest-http/pom.xml
+++ b/intermediate/rest-http/pom.xml
@@ -13,9 +13,9 @@
 	</prerequisites>
 
 	<properties>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
-		<spring.version>3.1.3.RELEASE</spring.version>
-		<spring.security.version>3.1.3.RELEASE</spring.security.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
+		<spring.version>3.2.6.RELEASE</spring.version>
+		<spring.security.version>3.1.4.RELEASE</spring.security.version>
 		<commons-fileupload>1.2</commons-fileupload>
 		<commons-io>1.3.2</commons-io>
 		<log4j.version>1.2.17</log4j.version>
diff --git a/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml b/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml
index fee9fa23..ae55e3c8 100644
--- a/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml
+++ b/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml
@@ -2,75 +2,75 @@
 <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.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
+		http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd
         http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd"
 	xmlns:int="http://www.springframework.org/schema/integration"
-	xmlns:oxm="http://www.springframework.org/schema/oxm" 
+	xmlns:oxm="http://www.springframework.org/schema/oxm"
 	xmlns:int-http="http://www.springframework.org/schema/integration/http">
-	
+
 	<int:annotation-config/>
-	
-	<!-- handler mapping implementation that is aware of inbound Spring Integration 
-			http inbound gateway's and inbound adapter's with "path" attributes -->
-	<bean class="org.springframework.integration.http.inbound.UriPathHandlerMapping"/>
-	
+
 	<!-- Inbound/Outbound Channels -->
 	<int:channel id="employeeSearchRequest" />
 	<int:channel id="employeeSearchResponse" />
-	
-	
-	<int-http:inbound-gateway id="inboundEmployeeSearchRequestGateway"		
-		supported-methods="GET, POST" 
+
+
+	<int-http:inbound-gateway id="inboundEmployeeSearchRequestGateway"
+		supported-methods="GET, POST"
 		request-channel="employeeSearchRequest"
-		reply-channel="employeeSearchResponse"		
-		mapped-response-headers="Return-Status, Return-Status-Msg, HTTP_RESPONSE_HEADERS"		
-		view-name="/employee" 
+		reply-channel="employeeSearchResponse"
+		mapped-response-headers="Return-Status, Return-Status-Msg, HTTP_RESPONSE_HEADERS"
+		view-name="/employee"
 		path="/services/employee/{id}/search"
 		reply-timeout="50000">
-				
+
 		<int-http:header name="employeeId" expression="#pathVariables.id"/>
-		
+
 	</int-http:inbound-gateway>
-	
- 
-	<!-- Note: The default parameter name for favorParameter is 'format'. For instance, when this flag is true, a request for /services/employee/{id}/search?format=json will result 
+
+
+	<!-- Note: The default parameter name for favorParameter is 'format'. For instance, when this flag is true, a request for /services/employee/{id}/search?format=json will result
 			in an MappingJacksonJsonView being resolved, while the Accept header can be the browser-defined text/html,application/xhtml+xml  -->
-			
+
 	<bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
-		<property name="order" value="1" />	
-		<property name="defaultContentType" value="application/xml"/>
-		<property name="favorParameter" value="true"/>	
-		<property name="ignoreAcceptHeader" value="true" />		
-		<property name="mediaTypes">
-			<map>
-				<entry key="json" value="application/json" />
-				<entry key="xml" value="application/xml" />				
-			</map>
+		<property name="order" value="1" />
+		<property name="contentNegotiationManager">
+			<bean class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean">
+				<property name="defaultContentType" value="application/xml"/>
+				<property name="favorParameter" value="true"/>
+				<property name="ignoreAcceptHeader" value="true" />
+				<property name="mediaTypes">
+					<map>
+						<entry key="json" value="application/json" />
+						<entry key="xml" value="application/xml" />
+					</map>
+				</property>
+			</bean>
 		</property>
 		<property name="defaultViews">
 			<list>
 				<bean
 					class="org.springframework.integration.samples.rest.json.view.ExtendedMappingJacksonJsonView" >
 					<property name="objectMapper" ref="jaxbJacksonObjectMapper"/>
-				</bean>	
+				</bean>
 				<bean class="org.springframework.web.servlet.view.xml.MarshallingView">
-					<constructor-arg ref="marshaller"/>					
-				</bean>				
+					<constructor-arg ref="marshaller"/>
+				</bean>
 			</list>
-		</property>				
+		</property>
 	</bean>
-	
-	<oxm:jaxb2-marshaller id="marshaller" contextPath="org.springframework.integration.samples.rest.domain" />
-	
-	<int:service-activator id="employeeServiceActivator" 
-					input-channel="employeeSearchRequest"
-					output-channel="employeeSearchResponse" 
-					ref="employeeSearchService" 
-					method="getEmployee" 
-					requires-reply="true"  
-					send-timeout="60000"/>
-	
-	<bean id="jaxbJacksonObjectMapper" class="org.springframework.integration.samples.rest.json.JaxbJacksonObjectMapper"/>				
 
-</beans>	
\ No newline at end of file
+	<oxm:jaxb2-marshaller id="marshaller" contextPath="org.springframework.integration.samples.rest.domain" />
+
+	<int:service-activator id="employeeServiceActivator"
+					input-channel="employeeSearchRequest"
+					output-channel="employeeSearchResponse"
+					ref="employeeSearchService"
+					method="getEmployee"
+					requires-reply="true"
+					send-timeout="60000"/>
+
+	<bean id="jaxbJacksonObjectMapper" class="org.springframework.integration.samples.rest.json.JaxbJacksonObjectMapper"/>
+
+</beans>
diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml
index 278f0417..26588ae4 100644
--- a/intermediate/retry-and-more/pom.xml
+++ b/intermediate/retry-and-more/pom.xml
@@ -15,7 +15,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.framework.version>3.1.3.RELEASE</spring.framework.version>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml
index 99f78d9c..362b067c 100644
--- a/intermediate/splitter-aggregator-reaper/pom.xml
+++ b/intermediate/splitter-aggregator-reaper/pom.xml
@@ -20,11 +20,11 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.0.RC2</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 		<inject.version>1</inject.version>
-		<spring.version>3.1.2.RELEASE</spring.version>
+		<spring.version>3.2.6.RELEASE</spring.version>
 	</properties>
 
 	<repositories>
@@ -98,4 +98,4 @@
 			<version>${spring.version}</version>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml
index f3d1f859..1c9495c3 100644
--- a/intermediate/stored-procedures-derby/pom.xml
+++ b/intermediate/stored-procedures-derby/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml
index dad86ec2..4eb5ba17 100644
--- a/intermediate/stored-procedures-ms/pom.xml
+++ b/intermediate/stored-procedures-ms/pom.xml
@@ -17,7 +17,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml
index 697b47f4..cf024d2d 100644
--- a/intermediate/stored-procedures-oracle/pom.xml
+++ b/intermediate/stored-procedures-oracle/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.2.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml
index 60da2e15..8dc992fd 100644
--- a/intermediate/stored-procedures-postgresql/pom.xml
+++ b/intermediate/stored-procedures-postgresql/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml
index 760ec5c5..45eef0ad 100644
--- a/intermediate/tcp-client-server-multiplex/pom.xml
+++ b/intermediate/tcp-client-server-multiplex/pom.xml
@@ -14,8 +14,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.version>3.1.3.RELEASE</spring.version>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.version>3.2.6.RELEASE</spring.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml
index d7fd5c9d..38d3e4c5 100644
--- a/intermediate/travel/pom.xml
+++ b/intermediate/travel/pom.xml
@@ -12,10 +12,10 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
-		<spring.version>3.1.3.RELEASE</spring.version>
+		<spring.version>3.2.6.RELEASE</spring.version>
 		<java.main.class>org.springframework.integration.samples.travel.Main</java.main.class>
 	</properties>
 	<dependencies>
diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml
index 223a298a..919daf3d 100755
--- a/intermediate/tx-synch/pom.xml
+++ b/intermediate/tx-synch/pom.xml
@@ -15,7 +15,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.framework.version>3.1.3.RELEASE</spring.framework.version>
-		<spring.integration.version>2.2.6.RELEASE</spring.integration.version>
+		<spring.integration.version>3.0.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>