diff --git a/org.springframework.integration.test/.classpath b/org.springframework.integration.test/.classpath
index 7a4f13232e..6a533f73bf 100644
--- a/org.springframework.integration.test/.classpath
+++ b/org.springframework.integration.test/.classpath
@@ -7,8 +7,8 @@
 	<classpathentry kind="con"
 		path="org.eclipse.jdt.launching.JRE_CONTAINER" />
 	<classpathentry kind="var"
-		path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.3.RELEASE/com.springsource.org.aspectj.weaver-1.6.3.RELEASE.jar"
-		sourcepath="/IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.3.RELEASE/com.springsource.org.aspectj.weaver-1.6.3.RELEASE.jar" />
+		path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.jar"
+		sourcepath="/IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.jar" />
 	<classpathentry kind="var"
 		path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar"
 		sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar" />
diff --git a/org.springframework.integration/.classpath b/org.springframework.integration/.classpath
index 2b52314112..34f94f189e 100644
--- a/org.springframework.integration/.classpath
+++ b/org.springframework.integration/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.3.RELEASE/com.springsource.org.aspectj.weaver-1.6.3.RELEASE.jar" sourcepath="/IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.3.RELEASE/com.springsource.org.aspectj.weaver-1.6.3.RELEASE.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.jar" sourcepath="/IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.5.RELEASE/com.springsource.org.aspectj.weaver-1.6.5.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
diff --git a/org.springframework.integration/ivy.xml b/org.springframework.integration/ivy.xml
index 94a0ae0add..ae396aff86 100644
--- a/org.springframework.integration/ivy.xml
+++ b/org.springframework.integration/ivy.xml
@@ -28,7 +28,7 @@
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
 		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="1.6.0" conf="test->runtime"/>
-		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.3.RELEASE" conf="test->runtime"/>
+		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="test->runtime"/>
 	</dependencies>
 
 </ivy-module>
\ No newline at end of file
diff --git a/spring-integration-samples/cafe/pom.xml b/spring-integration-samples/cafe/pom.xml
index fdaef72c42..2dbcff50d1 100644
--- a/spring-integration-samples/cafe/pom.xml
+++ b/spring-integration-samples/cafe/pom.xml
@@ -2,12 +2,12 @@
   <parent>
     <artifactId>spring-integration-samples</artifactId>
     <groupId>org.springframework.integration</groupId>
-    <version>1.0.3</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>cafe</groupId>
   <artifactId>cafe</artifactId>
-  <version>1.0.3</version>
+  <version>2.0.0.BUILD-SNAPSHOT</version>
   <dependencies>
 		<dependency>
 			<groupId>org.eclipse.osgi</groupId>
diff --git a/spring-integration-samples/errorhandling/pom.xml b/spring-integration-samples/errorhandling/pom.xml
index d568f774d8..707acf1321 100644
--- a/spring-integration-samples/errorhandling/pom.xml
+++ b/spring-integration-samples/errorhandling/pom.xml
@@ -2,10 +2,10 @@
   <parent>
     <artifactId>spring-integration-samples</artifactId>
     <groupId>org.springframework.integration</groupId>
-    <version>1.0.3</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>errorhandling</groupId>
   <artifactId>errorhandling</artifactId>
-  <version>1.0.3</version>
+  <version>2.0.0.BUILD-SNAPSHOT</version>
 </project>
\ No newline at end of file
diff --git a/spring-integration-samples/filecopy/pom.xml b/spring-integration-samples/filecopy/pom.xml
index 59e19f1338..2243224adb 100644
--- a/spring-integration-samples/filecopy/pom.xml
+++ b/spring-integration-samples/filecopy/pom.xml
@@ -2,10 +2,10 @@
   <parent>
     <artifactId>spring-integration-samples</artifactId>
     <groupId>org.springframework.integration</groupId>
-    <version>1.0.3</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>filecopy</groupId>
   <artifactId>filecopy</artifactId>
-  <version>1.0.3</version>
+  <version>2.0.0.BUILD-SNAPSHOT</version>
 </project>
\ No newline at end of file
diff --git a/spring-integration-samples/helloworld/pom.xml b/spring-integration-samples/helloworld/pom.xml
index 017cd5bbdf..ea890d860d 100644
--- a/spring-integration-samples/helloworld/pom.xml
+++ b/spring-integration-samples/helloworld/pom.xml
@@ -3,12 +3,12 @@
 	<parent>
 		<artifactId>spring-integration-samples</artifactId>
 		<groupId>org.springframework.integration</groupId>
-		<version>1.0.3</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>helloworld</groupId>
 	<artifactId>helloworld</artifactId>
-	<version>1.0.3</version>
+	<version>2.0.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>org.eclipse.osgi</groupId>
diff --git a/spring-integration-samples/jms/pom.xml b/spring-integration-samples/jms/pom.xml
index 0ed613d54a..6efe473df7 100644
--- a/spring-integration-samples/jms/pom.xml
+++ b/spring-integration-samples/jms/pom.xml
@@ -3,12 +3,12 @@
 	<parent>
 		<artifactId>spring-integration-samples</artifactId>
 		<groupId>org.springframework.integration</groupId>
-		<version>1.0.3</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>jms</groupId>
 	<artifactId>jms</artifactId>
-	<version>1.0.3</version>
+	<version>2.0.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>javax.jms</groupId>
diff --git a/spring-integration-samples/oddeven/pom.xml b/spring-integration-samples/oddeven/pom.xml
index 6a3525aa3b..57c61adc69 100644
--- a/spring-integration-samples/oddeven/pom.xml
+++ b/spring-integration-samples/oddeven/pom.xml
@@ -2,10 +2,10 @@
   <parent>
     <artifactId>spring-integration-samples</artifactId>
     <groupId>org.springframework.integration</groupId>
-    <version>1.0.3</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>oddeven</groupId>
   <artifactId>oddeven</artifactId>
-  <version>1.0.3</version>
+  <version>2.0.0.BUILD-SNAPSHOT</version>
 </project>
\ No newline at end of file
diff --git a/spring-integration-samples/pom.xml b/spring-integration-samples/pom.xml
index 925200bd57..199f424b55 100644
--- a/spring-integration-samples/pom.xml
+++ b/spring-integration-samples/pom.xml
@@ -162,6 +162,16 @@
 			<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
 			<url>http://repository.springsource.com/maven/bundles/external</url>
 		</repository>
+		<repository>
+			<id>com.springsource.repository.bundles.milestone</id>
+			<name>SpringSource Enterprise Bundle Repository - External Bundle Milestones</name>
+			<url>http://repository.springsource.com/maven/bundles/milestone</url>
+		</repository>
+		<repository>
+			<id>com.springsource.repository.bundles.snapshot</id>
+			<name>SpringSource Enterprise Bundle Repository - External Bundle Snapshots</name>
+			<url>http://repository.springsource.com/maven/bundles/snapshot</url>
+		</repository>
 	</repositories>
 	
 
diff --git a/spring-integration-samples/quote/pom.xml b/spring-integration-samples/quote/pom.xml
index 51016cdb12..d6cce12f02 100644
--- a/spring-integration-samples/quote/pom.xml
+++ b/spring-integration-samples/quote/pom.xml
@@ -2,10 +2,10 @@
   <parent>
     <artifactId>spring-integration-samples</artifactId>
     <groupId>org.springframework.integration</groupId>
-    <version>1.0.3</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>quote</groupId>
   <artifactId>quote</artifactId>
-  <version>1.0.3</version>
+  <version>2.0.0.BUILD-SNAPSHOT</version>
 </project>
\ No newline at end of file
diff --git a/spring-integration-samples/ws/pom.xml b/spring-integration-samples/ws/pom.xml
index 628ec319d4..0a18347b69 100644
--- a/spring-integration-samples/ws/pom.xml
+++ b/spring-integration-samples/ws/pom.xml
@@ -3,12 +3,12 @@
 	<parent>
 		<artifactId>spring-integration-samples</artifactId>
 		<groupId>org.springframework.integration</groupId>
-		<version>1.0.3</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ws</groupId>
 	<artifactId>ws</artifactId>
-	<version>1.0.3</version>
+	<version>2.0.0.BUILD-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>javax.xml.soap</groupId>
diff --git a/spring-integration-samples/xml/pom.xml b/spring-integration-samples/xml/pom.xml
index b326ab6254..6fc74998fb 100644
--- a/spring-integration-samples/xml/pom.xml
+++ b/spring-integration-samples/xml/pom.xml
@@ -2,10 +2,10 @@
   <parent>
     <artifactId>spring-integration-samples</artifactId>
     <groupId>org.springframework.integration</groupId>
-    <version>1.0.3</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>xml</groupId>
   <artifactId>xml</artifactId>
-  <version>1.0.3</version>
+  <version>2.0.0.BUILD-SNAPSHOT</version>
 </project>
\ No newline at end of file