diff --git a/build-spring-integration/pom.xml b/build-spring-integration/pom.xml
index 8e0ffd223c..2cba87cda8 100644
--- a/build-spring-integration/pom.xml
+++ b/build-spring-integration/pom.xml
@@ -14,7 +14,7 @@
     a simple model for building enterprise integration solutions while maintaining the separation of
     concerns that is essential for producing maintainable, testable code. 
   </description>
-  <version>1.0.3.RELEASE</version>
+  <version>2.0.0.BUILD-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules> 
       <module>../spring-integration-parent</module>
diff --git a/org.springframework.integration.adapter/pom.xml b/org.springframework.integration.adapter/pom.xml
index 23245884cd..f64fb901e9 100644
--- a/org.springframework.integration.adapter/pom.xml
+++ b/org.springframework.integration.adapter/pom.xml
@@ -8,20 +8,20 @@
   <parent>
     <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-parent</artifactId>
-    <version>1.0.3.RELEASE</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
     <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.integration.event/pom.xml b/org.springframework.integration.event/pom.xml
index 98e2e8bc7c..45aa15e84c 100644
--- a/org.springframework.integration.event/pom.xml
+++ b/org.springframework.integration.event/pom.xml
@@ -8,20 +8,20 @@
   <parent>
     <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-parent</artifactId>
-    <version>1.0.3.RELEASE</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
     <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.integration.file/pom.xml b/org.springframework.integration.file/pom.xml
index 14b066d1fe..0e653f88f5 100644
--- a/org.springframework.integration.file/pom.xml
+++ b/org.springframework.integration.file/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-parent</artifactId>
-    <version>1.0.3.RELEASE</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
     <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
@@ -33,19 +33,19 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.integration.http/pom.xml b/org.springframework.integration.http/pom.xml
index 80f5aaa83b..124bdd5ae3 100644
--- a/org.springframework.integration.http/pom.xml
+++ b/org.springframework.integration.http/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-parent</artifactId>
-    <version>1.0.3.RELEASE</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
     <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
@@ -39,13 +39,13 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.integration.httpinvoker/pom.xml b/org.springframework.integration.httpinvoker/pom.xml
index ecc332fe97..16c65f56eb 100644
--- a/org.springframework.integration.httpinvoker/pom.xml
+++ b/org.springframework.integration.httpinvoker/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-parent</artifactId>
-    <version>1.0.3.RELEASE</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
     <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
@@ -21,25 +21,25 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.integration.jms/pom.xml b/org.springframework.integration.jms/pom.xml
index 499845b764..7ff3cc13ed 100644
--- a/org.springframework.integration.jms/pom.xml
+++ b/org.springframework.integration.jms/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-parent</artifactId>
-    <version>1.0.3.RELEASE</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
     <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
@@ -27,19 +27,19 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jms</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.integration.mail/pom.xml b/org.springframework.integration.mail/pom.xml
index 26a1b4cd3c..0eb6b902d6 100644
--- a/org.springframework.integration.mail/pom.xml
+++ b/org.springframework.integration.mail/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-parent</artifactId>
-    <version>1.0.3.RELEASE</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
     <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
@@ -45,19 +45,19 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.integration.rmi/pom.xml b/org.springframework.integration.rmi/pom.xml
index 66f2e5e988..f6d0615f63 100644
--- a/org.springframework.integration.rmi/pom.xml
+++ b/org.springframework.integration.rmi/pom.xml
@@ -8,32 +8,32 @@
   <parent>
     <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-parent</artifactId>
-    <version>1.0.3.RELEASE</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
     <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.integration.security/pom.xml b/org.springframework.integration.security/pom.xml
index 671f574e49..08dc314b99 100644
--- a/org.springframework.integration.security/pom.xml
+++ b/org.springframework.integration.security/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-parent</artifactId>
-    <version>1.0.3.RELEASE</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
     <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
@@ -21,25 +21,25 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.integration.stream/pom.xml b/org.springframework.integration.stream/pom.xml
index 4002c174b1..8f5529d2c9 100644
--- a/org.springframework.integration.stream/pom.xml
+++ b/org.springframework.integration.stream/pom.xml
@@ -8,26 +8,26 @@
   <parent>
     <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-parent</artifactId>
-    <version>1.0.3.RELEASE</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
     <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.integration.test/pom.xml b/org.springframework.integration.test/pom.xml
new file mode 100644
index 0000000000..b9c1513371
--- /dev/null
+++ b/org.springframework.integration.test/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.springframework.integration</groupId>
+  <artifactId>spring-integration-test</artifactId>
+  <packaging>jar</packaging>
+  <name>Spring Integration Testing Support</name>
+  <parent>
+    <groupId>org.springframework.integration</groupId>
+    <artifactId>spring-integration-parent</artifactId>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
+    <relativePath>../spring-integration-parent</relativePath>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>2.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <testResources>
+      <testResource>
+        <directory>src/test/java</directory>
+        <includes>
+          <include>**/*.xml</include>
+        </includes>
+      </testResource>
+      <testResource>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>**/*.xsd</include>
+        </includes>
+      </testResource>
+
+      <testResource>
+        <directory>../org.springframework.integration/src/main/java</directory>
+        <includes>
+          <include>**/*.xsd</include>
+        </includes>
+      </testResource>
+    </testResources>
+  </build>
+</project>
\ No newline at end of file
diff --git a/org.springframework.integration.ws/pom.xml b/org.springframework.integration.ws/pom.xml
index 50aa592d6b..769a4db772 100644
--- a/org.springframework.integration.ws/pom.xml
+++ b/org.springframework.integration.ws/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-parent</artifactId>
-    <version>1.0.3.RELEASE</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
     <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
@@ -51,13 +51,13 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/org.springframework.integration.xml/pom.xml b/org.springframework.integration.xml/pom.xml
index 5ca9e52d63..0feb3057f1 100644
--- a/org.springframework.integration.xml/pom.xml
+++ b/org.springframework.integration.xml/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-parent</artifactId>
-    <version>1.0.3.RELEASE</version>
+    <version>2.0.0.BUILD-SNAPSHOT</version>
     <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
@@ -48,19 +48,19 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>2.5.6</version>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.integration/pom.xml b/org.springframework.integration/pom.xml
index a98ccb37cd..0a095addb4 100644
--- a/org.springframework.integration/pom.xml
+++ b/org.springframework.integration/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.integration</groupId>
 		<artifactId>spring-integration-parent</artifactId>
-		<version>1.0.3.RELEASE</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>../spring-integration-parent</relativePath>
 	</parent>
 	<dependencies>
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.4</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -58,7 +58,4 @@
 		       <scope>test</scope>
 		</dependency>
 	</dependencies>
-	<properties>
-		<spring.version>2.5.6</spring.version>
-	</properties>
 </project>
\ No newline at end of file
diff --git a/spring-integration-parent/pom.xml b/spring-integration-parent/pom.xml
index 2c9728a73d..38cbd5fa54 100644
--- a/spring-integration-parent/pom.xml
+++ b/spring-integration-parent/pom.xml
@@ -12,6 +12,8 @@
   <packaging>pom</packaging>
   <properties>
     <org.eclipse.jdt.core.version>3.4.2.v_883_R34x</org.eclipse.jdt.core.version>
+    <junit.version>4.6</spring.version>
+    <spring.version>3.0.0.M4</spring.version>
   </properties>
   <profiles>
     <profile>
diff --git a/spring-integration-samples/pom.xml b/spring-integration-samples/pom.xml
index 28746e05d2..925200bd57 100644
--- a/spring-integration-samples/pom.xml
+++ b/spring-integration-samples/pom.xml
@@ -5,11 +5,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-samples</artifactId>
-	<version>1.0.3</version>
+	<version>2.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Integration Samples</name>
 	<properties>
-		<release.version>1.0.3.RELEASE</release.version>
+		<release.version>2.0.0.BUILD-SNAPSHOT</release.version>
 	</properties>
 	<modules>
 		<module>cafe</module>