diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml
index 49ef9a91..03da507f 100644
--- a/advanced/advanced-testing-examples/pom.xml
+++ b/advanced/advanced-testing-examples/pom.xml
@@ -4,11 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>advanced-testing-examples</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<name>Samples (Advanced) - Advanced Testing Examples</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <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>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
@@ -19,13 +20,13 @@
 			<artifactId>spring-integration-jms</artifactId>
 			<version>${spring.integration.version}</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-groovy</artifactId>
 			<version>${spring.integration.version}</version>
 		</dependency>
-		 
+
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
@@ -43,28 +44,28 @@
 			<version>${spring.version}</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jms</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
-		
+
 		   <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
             <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
-        
-  
+
+
          <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
             <version>1.8.5</version>
             <scope>test</scope>
         </dependency>
-        
+
 	</dependencies>
 	<build>
 		<testResources>
@@ -88,6 +89,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -106,21 +108,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file
diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml
index 8a35905b..d6add4d6 100644
--- a/advanced/dynamic-ftp/pom.xml
+++ b/advanced/dynamic-ftp/pom.xml
@@ -6,8 +6,9 @@
 	<name>Samples (Advanced) - Dynamic FTP Demo</name>
 	<packaging>jar</packaging>
 	<properties>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.framework.version>3.1.0.RELEASE</spring.framework.version>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -53,6 +54,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -72,21 +74,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/advanced/pom.xml b/advanced/pom.xml
index 1fb63896..6c8928b1 100644
--- a/advanced/pom.xml
+++ b/advanced/pom.xml
@@ -5,13 +5,13 @@
 	<modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.integration.samples</groupId>
 	<artifactId>advanced-samples</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<version>2.1.0.RELEASE</version>
 	<name>Spring Integration Samples - Advanced</name>
 	<packaging>pom</packaging>
 
 	<modules>
-        <module>advanced-testing-examples</module> 
-        <module>dynamic-ftp</module> 
+        <module>advanced-testing-examples</module>
+        <module>dynamic-ftp</module>
 	</modules>
 
 </project>
diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml
index fe43ae78..9823c05b 100644
--- a/applications/cafe-scripted/pom.xml
+++ b/applications/cafe-scripted/pom.xml
@@ -7,7 +7,8 @@
 	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<name>Samples (Applications) - Cafe Sample (Scripted Implementation)</name>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <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>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
@@ -85,7 +86,7 @@
 			<version>${junit.version}</version>
 		</dependency>
 
-		<!-- This is an older release. 1.6 and above cause stdout to mysteriously 
+		<!-- This is an older release. 1.6 and above cause stdout to mysteriously
 			dissappear -->
 
 		<dependency>
@@ -107,13 +108,13 @@
 		</dependency>
 
 	</dependencies>
-	
+
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.2</version>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.6</target>
@@ -181,7 +182,7 @@
 								<argument>-classpath</argument>
 								<classpath />
 								<argument>org.springframework.integration.samples.cafe.demo.ControlBusMain</argument>
-								 
+
 							</arguments>
 							<successCodes>
 								<successCode>0</successCode>
@@ -192,21 +193,11 @@
 			</build>
 		</profile>
 	</profiles>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml
index 9fe7964d..cc78309a 100644
--- a/applications/cafe/pom.xml
+++ b/applications/cafe/pom.xml
@@ -7,7 +7,8 @@
 	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<name>Samples (Applications) - Cafe Sample</name>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
         <spring.core.version>3.1.0.RELEASE</spring.core.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
@@ -61,6 +62,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -71,21 +73,11 @@
 			</plugin>
 		</plugins>
 	</build>
-		<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml
index 7082fce2..dd78c118 100644
--- a/applications/loan-broker/pom.xml
+++ b/applications/loan-broker/pom.xml
@@ -7,7 +7,8 @@
 	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<name>Samples (Applications) - Loan Broker</name>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<commons-logging.version>1.1.1</commons-logging.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
@@ -40,6 +41,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -50,21 +52,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml
index 769288e3..158dddc6 100644
--- a/applications/loanshark/pom.xml
+++ b/applications/loanshark/pom.xml
@@ -7,40 +7,20 @@
 	<name>Samples (Applications) - Loan Shark</name>
 	<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>
 		<aspectj.version>1.6.10</aspectj.version>
 		<slf4j.version>1.6.1</slf4j.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
-	<repositories>
+    <repositories>
         <repository>
-            <id>spring-maven-release</id>
-            <name>Spring Maven Release Repository</name>
-            <url>http://maven.springframework.org/release</url>
-        </repository>
-        <repository>
-            <id>spring-maven-milestone</id>
-            <name>Spring Maven Milestone Repository</name>
-            <url>http://maven.springframework.org/milestone</url>
-        </repository>
-		<repository>
-            <id>JBoss Repo</id>
-            <url>https://repository.jboss.org/nexus/content/repositories/releases</url>
-            <name>JBoss Repo</name>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
         </repository>
     </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-maven-release</id>
-            <name>Spring Maven Release Repository</name>
-            <url>http://maven.springframework.org/release</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-maven-milestone</id>
-            <name>Spring Maven Milestone Repository</name>
-            <url>http://maven.springframework.org/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
+
 	<dependencies>
 		<!-- General dependencies for standard applications -->
 		<dependency>
@@ -343,7 +323,7 @@
     <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-ip</artifactId>
-            <version>2.1.0.RC1</version>
+            <version>${spring.integration.version}</version>
         </dependency>
     </dependencies>
 	<build>
@@ -359,7 +339,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.1</version>
+                <version>2.3.2</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml
index c015a200..ec5e5745 100644
--- a/basic/amqp/pom.xml
+++ b/basic/amqp/pom.xml
@@ -12,27 +12,17 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.integration.version>2.1.0.RC1</spring.integration.version>
+        <spring.integration.version>2.1.0.RELEASE</spring.integration.version>
         <slf4j.version>1.6.4</slf4j.version>
         <junit.version>4.10</junit.version>
     </properties>
 
     <repositories>
         <repository>
-            <id>repository.springframework.maven.release</id>
-            <name>Spring Framework Maven Release Repository</name>
-            <url>http://maven.springframework.org/release</url>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
         </repository>
-        <repository>
-            <id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
     </repositories>
 
     <build>
@@ -104,7 +94,7 @@
             <artifactId>spring-integration-stream</artifactId>
             <version>${spring.integration.version}</version>
         </dependency>
-                
+
         <!-- Logging -->
 
         <dependency>
diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml
index 7ef4fa93..f4957ed5 100644
--- a/basic/control-bus/pom.xml
+++ b/basic/control-bus/pom.xml
@@ -4,11 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>control-bus</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<name>Samples (Basic) - Control Bus</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -35,6 +36,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -45,21 +47,11 @@
 			</plugin>
 		</plugins>
 	</build>
-		<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file
diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml
index 3b33985b..ac790a4d 100644
--- a/basic/enricher/pom.xml
+++ b/basic/enricher/pom.xml
@@ -12,22 +12,17 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.integration.version>2.1.0.RC1</spring.integration.version>
+        <spring.integration.version>2.1.0.RELEASE</spring.integration.version>
         <slf4j.version>1.6.4</slf4j.version>
         <junit.version>4.10</junit.version>
     </properties>
 
     <repositories>
         <repository>
-            <id>repository.springframework.maven.release</id>
-            <name>Spring Framework Maven Release Repository</name>
-            <url>http://maven.springframework.org/release</url>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
         </repository>
-		<repository>
-		    <id>repository.springframework.maven.milestone</id>
-		    <name>Spring Framework Maven Milestone Repository</name>
-		    <url>http://maven.springframework.org/milestone</url>
-		</repository>
     </repositories>
 
     <build>
diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml
index 954556a1..adda6d3a 100644
--- a/basic/feed/pom.xml
+++ b/basic/feed/pom.xml
@@ -6,7 +6,8 @@
 	<name>Samples (Basic) - Feed Demo (RSS/ATOM)</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -33,6 +34,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -43,21 +45,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file
diff --git a/basic/file/pom.xml b/basic/file/pom.xml
index 7221c26d..5ce95daa 100644
--- a/basic/file/pom.xml
+++ b/basic/file/pom.xml
@@ -4,11 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>file</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<name>Samples (Basic) - File Copy</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -35,6 +36,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -45,21 +47,11 @@
 			</plugin>
 		</plugins>
 	</build>
-		<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml
index fddbc558..23fe9f44 100644
--- a/basic/ftp/pom.xml
+++ b/basic/ftp/pom.xml
@@ -6,7 +6,8 @@
 	<name>Samples (Basic) - FTP Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
         <slf4j.version>1.6.4</slf4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -22,7 +23,7 @@
 			<artifactId>commons-io</artifactId>
 			<version>2.1</version>
 		</dependency>
-		
+
 		<!-- test-scoped dependencies -->
 		<dependency>
 			<groupId>junit</groupId>
@@ -34,7 +35,7 @@
 		  <artifactId>ftpserver-core</artifactId>
 		  <version>1.0.6</version>
 		</dependency>
-		
+
         <!-- Logging -->
 
         <dependency>
@@ -56,7 +57,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
             <version>${slf4j.version}</version>
-        </dependency>				
+        </dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -84,21 +85,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml
index a8161b00..4f50472d 100644
--- a/basic/helloworld/pom.xml
+++ b/basic/helloworld/pom.xml
@@ -4,11 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>helloworld</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<name>Samples (Basic) - Hello World Sample</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -35,6 +36,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -45,21 +47,11 @@
 			</plugin>
 		</plugins>
 	</build>
-		<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file
diff --git a/basic/http/pom.xml b/basic/http/pom.xml
index 51a9dee1..5f4b1940 100644
--- a/basic/http/pom.xml
+++ b/basic/http/pom.xml
@@ -7,7 +7,8 @@
 	<name>Samples (Basic) - HTTP Demo</name>
 	<packaging>war</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <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>
 		<commons-fileupload>1.2</commons-fileupload>
 		<commons-io>1.3.2</commons-io>
@@ -55,6 +56,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -65,21 +67,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml
index 2292745b..1e57c89c 100644
--- a/basic/jdbc/pom.xml
+++ b/basic/jdbc/pom.xml
@@ -12,22 +12,17 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.integration.version>2.1.0.RC1</spring.integration.version>
+        <spring.integration.version>2.1.0.RELEASE</spring.integration.version>
         <slf4j.version>1.6.4</slf4j.version>
         <junit.version>4.10</junit.version>
     </properties>
 
     <repositories>
         <repository>
-            <id>repository.springframework.maven.release</id>
-            <name>Spring Framework Maven Release Repository</name>
-            <url>http://maven.springframework.org/release</url>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
         </repository>
-		<repository>
-		    <id>repository.springframework.maven.milestone</id>
-		    <name>Spring Framework Maven Milestone Repository</name>
-		    <url>http://maven.springframework.org/milestone</url>
-		</repository>
     </repositories>
 
     <build>
diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml
index 1140c501..595aedcf 100644
--- a/basic/jms/pom.xml
+++ b/basic/jms/pom.xml
@@ -4,11 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>jms</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<name>Samples (Basic) - JMS</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<activemq.version>5.5.1</activemq.version>
 	</properties>
 	<dependencies>
@@ -50,6 +51,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -60,21 +62,11 @@
 			</plugin>
 		</plugins>
 	</build>
-		<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml
index 0ec68000..6a3f7a7e 100644
--- a/basic/jmx/pom.xml
+++ b/basic/jmx/pom.xml
@@ -5,10 +5,11 @@
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>jmx</artifactId>
 	<name>Samples (Basic) - JMX</name>
-	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -27,7 +28,7 @@
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 			<version>${log4j.version}</version>
-		</dependency>  
+		</dependency>
 		<!-- test-scoped dependencies -->
 		<dependency>
 			<groupId>junit</groupId>
@@ -40,6 +41,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -50,21 +52,11 @@
 			</plugin>
 		</plugins>
 	</build>
-		<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file
diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml
index 09bad403..0d5e5b72 100644
--- a/basic/mail/pom.xml
+++ b/basic/mail/pom.xml
@@ -6,7 +6,8 @@
 	<name>Samples (Basic) - Mail Demo (IMAP + POP3)</name>
 	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -44,6 +45,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -54,21 +56,11 @@
 			</plugin>
 		</plugins>
 	</build>
-		<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file
diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml
index 9495a508..382c4d7c 100644
--- a/basic/oddeven/pom.xml
+++ b/basic/oddeven/pom.xml
@@ -5,10 +5,11 @@
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>oddeven</artifactId>
 	<name>Samples (Basic) - Odd-Even Sample</name>
-	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -35,6 +36,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -45,21 +47,11 @@
 			</plugin>
 		</plugins>
 	</build>
-		<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml
index 8229d675..121accee 100644
--- a/basic/quote/pom.xml
+++ b/basic/quote/pom.xml
@@ -5,10 +5,11 @@
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>quote</artifactId>
 	<name>Samples (Basic) - Quote Sample</name>
-	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -35,6 +36,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -45,21 +47,11 @@
 			</plugin>
 		</plugins>
 	</build>
-		<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml
index fd777086..eb5322ff 100644
--- a/basic/sftp/pom.xml
+++ b/basic/sftp/pom.xml
@@ -7,7 +7,8 @@
 	<name>Samples (Basic) - SFTP Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -34,6 +35,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -44,21 +46,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml
index 6592c0f1..b43cb304 100644
--- a/basic/tcp-client-server/pom.xml
+++ b/basic/tcp-client-server/pom.xml
@@ -4,12 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>tcp-client-server</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<name>Samples (Basic) - TCP Client Server Sample</name>
 	<packaging>jar</packaging>
 	<properties>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.version>3.1.0.RELEASE</spring.version>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -52,6 +53,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -62,21 +64,11 @@
 			</plugin>
 		</plugins>
 	</build>
-		<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file
diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml
index ea0c28d4..1dc52155 100644
--- a/basic/testing-examples/pom.xml
+++ b/basic/testing-examples/pom.xml
@@ -4,12 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>testing-examples</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<name>Samples (Basic) - Testing Examples</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
-		<spring.version>3.0.6.RELEASE</spring.version>
+	    <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>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -23,6 +24,16 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-ws</artifactId>
 			<version>${spring.integration.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>spring-web</artifactId>
+					<groupId>org.springframework</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>spring-expression</artifactId>
+					<groupId>org.springframework</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
@@ -53,9 +64,25 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
+			<artifactId>spring-webmvc</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+            <exclusions>
+            	<exclusion>
+            		<artifactId>spring-expression</artifactId>
+            		<groupId>org.springframework</groupId>
+            	</exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-oxm</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
 	</dependencies>
 	<build>
 		<testResources>
@@ -79,6 +106,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -89,6 +117,7 @@
 			</plugin>
 			<plugin>
 			  <artifactId>maven-surefire-plugin</artifactId>
+			  <version>2.11</version>
 			  <configuration>
 			    <includes>
 			      <include>**/*Tests.java</include>
@@ -97,21 +126,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file
diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml
index a57acf45..a46fe6c6 100644
--- a/basic/twitter/pom.xml
+++ b/basic/twitter/pom.xml
@@ -6,7 +6,8 @@
 	<name>Samples (Basic) - Twitter Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -33,6 +34,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -43,21 +45,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file
diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml
index 5bf129bd..6c4b32a1 100644
--- a/basic/ws-inbound-gateway/pom.xml
+++ b/basic/ws-inbound-gateway/pom.xml
@@ -5,10 +5,11 @@
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>ws-inbound-gateway</artifactId>
 	<name>Samples (Basic) - WS Inbound Gateway Sample</name>
-	<version>2.1.0.BUILD-SNAPSHOT</version>	
+	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <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>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
@@ -46,6 +47,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -56,21 +58,11 @@
 			</plugin>
 		</plugins>
 	</build>
-		<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml
index b76f2288..605b09b3 100644
--- a/basic/ws-outbound-gateway/pom.xml
+++ b/basic/ws-outbound-gateway/pom.xml
@@ -8,7 +8,8 @@
 	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 		<saaj.version>1.3</saaj.version>
@@ -52,6 +53,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -62,21 +64,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file
diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml
index e608afb4..3e50dd72 100644
--- a/basic/xml/pom.xml
+++ b/basic/xml/pom.xml
@@ -8,7 +8,8 @@
 	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -35,6 +36,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -45,21 +47,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file
diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml
index f5a49921..38f571f5 100644
--- a/basic/xmpp/pom.xml
+++ b/basic/xmpp/pom.xml
@@ -6,7 +6,8 @@
 	<name>Samples (Basic) - XMPP Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -33,6 +34,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -43,21 +45,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file
diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml
index 7530769b..8940b0b3 100644
--- a/intermediate/async-gateway/pom.xml
+++ b/intermediate/async-gateway/pom.xml
@@ -7,7 +7,8 @@
 	<name>Samples (Intermediate) - Async Gateway Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -34,6 +35,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -44,21 +46,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml
index 44fc73a8..0a1d1a4c 100644
--- a/intermediate/errorhandling/pom.xml
+++ b/intermediate/errorhandling/pom.xml
@@ -7,7 +7,8 @@
 	<name>Samples (Intermediate) - Error Handling Sample</name>
 	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -39,6 +40,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -49,21 +51,11 @@
 			</plugin>
 		</plugins>
 	</build>
-		<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml
index e6d187c5..d6c117bd 100644
--- a/intermediate/file-processing/pom.xml
+++ b/intermediate/file-processing/pom.xml
@@ -1,10 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>orf.springframework.integration.samples</groupId>
+  <groupId>org.springframework.integration.samples</groupId>
   <artifactId>file-processing</artifactId>
   <version>2.1.0.BUILD-SNAPSHOT</version>
-<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -31,6 +32,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -41,22 +43,12 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 	<name>Samples (Intermediate) - File Processing</name>
 </project>
\ No newline at end of file
diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml
index 2d354d86..bcddfce9 100644
--- a/intermediate/multipart-http/pom.xml
+++ b/intermediate/multipart-http/pom.xml
@@ -7,7 +7,8 @@
 	<name>Samples (Intermediate) - HTTP Multipart Demo</name>
 	<packaging>war</packaging>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <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>
 		<commons-fileupload>1.2</commons-fileupload>
 		<commons-io>1.3.2</commons-io>
@@ -62,6 +63,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -72,21 +74,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml
index 4584aab5..ea91ea0c 100644
--- a/intermediate/stored-procedures-derby/pom.xml
+++ b/intermediate/stored-procedures-derby/pom.xml
@@ -12,28 +12,18 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.integration.version>2.1.0.RC1</spring.integration.version>
+        <spring.integration.version>2.1.0.RELEASE</spring.integration.version>
         <slf4j.version>1.6.4</slf4j.version>
         <junit.version>4.10</junit.version>
     </properties>
 
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 
     <build>
         <plugins>
diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml
index 2e92fce2..85d3da5b 100644
--- a/intermediate/stored-procedures-oracle/pom.xml
+++ b/intermediate/stored-procedures-oracle/pom.xml
@@ -12,16 +12,16 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.integration.version>2.1.0.RC1</spring.integration.version>
+        <spring.integration.version>2.1.0.RELEASE</spring.integration.version>
         <slf4j.version>1.6.4</slf4j.version>
         <junit.version>4.10</junit.version>
     </properties>
 
     <repositories>
         <repository>
-            <id>repository.springframework.maven.release</id>
-            <name>Spring Framework Maven Release Repository</name>
-            <url>http://maven.springframework.org/release</url>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
         </repository>
     </repositories>
 
@@ -82,13 +82,13 @@
             <artifactId>spring-integration-core</artifactId>
             <version>${spring.integration.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-jdbc</artifactId>
             <version>${spring.integration.version}</version>
         </dependency>
-        
+
         <!-- Logging -->
 
         <dependency>
diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml
index 774663bd..d4c43208 100644
--- a/intermediate/tcp-client-server-multiplex/pom.xml
+++ b/intermediate/tcp-client-server-multiplex/pom.xml
@@ -8,8 +8,9 @@
 	<name>Samples (Intermediate) - TCP Client Server Multiplexing Sample</name>
 	<packaging>jar</packaging>
 	<properties>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring.version>3.1.0.RELEASE</spring.version>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 	</properties>
@@ -47,6 +48,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -57,21 +59,11 @@
 			</plugin>
 		</plugins>
 	</build>
-		<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml
index cbb7d8bd..5668f394 100644
--- a/intermediate/travel/pom.xml
+++ b/intermediate/travel/pom.xml
@@ -6,7 +6,8 @@
 	<name>Samples (Intermediate) - Travel Services</name>
 	<version>2.1.0.BUILD-SNAPSHOT</version>
 	<properties>
-		<spring.integration.version>2.1.0.RC1</spring.integration.version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.integration.version>2.1.0.RELEASE</spring.integration.version>
 		<log4j.version>1.2.16</log4j.version>
 		<junit.version>4.10</junit.version>
 		<spring.version>3.1.0.RELEASE</spring.version>
@@ -49,6 +50,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -59,21 +61,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>	
+    <repositories>
+        <repository>
+            <id>repo.springsource.org.milestone</id>
+            <name>Spring Framework Maven Milestone Repository</name>
+            <url>https://repo.springsource.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file