diff --git a/pom.xml b/pom.xml
index 30bb14b7f2..b99d5adfbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,10 @@
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration</artifactId>
 	<name>Spring Integration</name>
-	<url>http://www.springsource.org/spring-integration</url>
 	<version>2.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>spring-integration-core</module>
-		<module>spring-integration-test</module>
 		<module>spring-integration-event</module>
 		<module>spring-integration-file</module>
 		<module>spring-integration-http</module>
@@ -20,30 +18,17 @@
 		<module>spring-integration-jms</module>
 		<module>spring-integration-jmx</module>
 		<module>spring-integration-mail</module>
+		<module>spring-integration-parent</module>
 		<module>spring-integration-rmi</module>
+		<module>spring-integration-samples</module>
 		<module>spring-integration-security</module>
 		<module>spring-integration-stream</module>
+		<module>spring-integration-test</module>
 		<module>spring-integration-ws</module>
 		<module>spring-integration-xml</module>
-		<!-- TODO: leave samples in, or remove? -->
-		<module>spring-integration-samples</module>
 	</modules>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<!-- versions for commonly-used dependencies -->
-		<cglib.version>2.2</cglib.version>
-		<commons-logging.version>1.1.1</commons-logging.version>
-		<junit.version>4.7</junit.version>
-		<log4j.version>1.2.12</log4j.version>
-		<hsqldb.version>1.8.0.10</hsqldb.version>
-		<org.aspectj.version>1.6.5</org.aspectj.version>
-		<org.easymock.version>2.3</org.easymock.version>
-		<org.eclipse.jdt.core.version>3.4.2.v_883_R34x</org.eclipse.jdt.core.version>
-		<org.mockito.version>1.8.4</org.mockito.version>
-		<org.slf4j.version>1.5.10</org.slf4j.version>
-		<org.springframework.version>3.0.2.RELEASE</org.springframework.version>
-		<org.springframework.security.version>2.0.5.RELEASE</org.springframework.security.version>
-		<org.springframework.ws.version>1.5.8</org.springframework.ws.version>
 	</properties>
 	<profiles>
 		<profile>
@@ -82,76 +67,7 @@
 		</site>
 	</distributionManagement>
 	<build>
-		<extensions>
-			<extension>
-				<groupId>org.springframework.build.aws</groupId>
-				<artifactId>org.springframework.build.aws.maven</artifactId>
-				<version>2.0.0.RELEASE</version>
-			</extension>
-		</extensions>
-		<resources>
-			<resource>
-				<directory>${project.basedir}/src/main/java</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-			<resource>
-				<directory>${project.basedir}/src/main/resources</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-			</resource>
-		</resources>
-		<testResources>
-			<testResource>
-				<directory>${project.basedir}/src/test/java</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</testResource>
-			<testResource>
-				<directory>${project.basedir}/src/test/resources</directory>
-				<includes>
-					<include>**/*</include>
-				</includes>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</testResource>
-		</testResources>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-					<compilerArgument>-Xlint:all</compilerArgument>
-					<showWarnings>true</showWarnings>
-					<showDeprecation>false</showDeprecation>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<useFile>false</useFile>
-					<includes>
-						<include>**/*Tests.java</include>
-					</includes>
-					<excludes>
-						<exclude>**/Abstract*.java</exclude>
-					</excludes>
-					<junitArtifactName>junit:junit</junitArtifactName>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>com.agilejava.docbkx</groupId>
 				<artifactId>docbkx-maven-plugin</artifactId>
@@ -162,7 +78,7 @@
 							<goal>generate-html</goal>
 							<goal>generate-pdf</goal>
 						</goals>
-						<phase>pre-site</phase>
+						<phase>package</phase>
 					</execution>
 				</executions>
 				<dependencies>
@@ -211,35 +127,60 @@
 				</configuration>
 			</plugin>
 			<plugin>
-				<artifactId>maven-source-plugin</artifactId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.5</version>
 				<executions>
 					<execution>
-						<id>attach-sources</id>
+						<id>aggregate</id>
 						<goals>
-							<goal>jar</goal>
+							<goal>aggregate</goal>
 						</goals>
+						<phase>package</phase>
+						<configuration>
+							<javadoc:aggregate>true</javadoc:aggregate>
+							<breakiterator>true</breakiterator>
+							<header>Spring Integration</header>
+							<source>1.5</source>
+							<quiet>true</quiet>
+							<javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>
+							<overview>${project.basedir}/src/main/javadoc/overview.html</overview>
+							<stylesheetfile>${project.basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
+							<!-- copies doc-files subdirectory which contains image resources -->
+							<docfilessubdirs>true</docfilessubdirs>
+							<groups>
+								<group>
+									<title>Spring Integration</title>
+									<packages>org.springframework.integration.core</packages>
+								</group>
+								<!-- TODO: fill in other groups -->
+							</groups>
+							<excludePackageNames>org.springframework.integration.samples</excludePackageNames>
+							<links>
+								<link>http://static.springframework.org/spring/docs/3.0.2.RELEASE/javadoc-api</link>
+								<link>http://java.sun.com/javase/6/docs/api</link>
+							</links>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+			<!-- copies a tightly-controlled set of dependencies into ${project.build.dir}/dependency
+				 in order to be added to the distribution jar during the assembly process.
+
+				 WARNING: any new dependencies added to project pom files over time must be added explicitly
+				 to this list if they are to make it into the distribution zip.  This section should be
+				 considered fragile. Ideally, we would use the 'copy-dependencies' goal of the
+				 maven-dependency-plugin, which automatically adds all project dependencies, but it does
+				 not offer enough fine-grained control over what jars are added and which are not.
+
+				 NOTE: an unfortunate side effect of this plugin is that it runs not just once, but for
+				 every module in the build.  This is annoying but harmless, and adds only a few seconds
+				 to the overall build time.  It also creates a false sense of size in the target directories
+				 but again this is probably negligible.
+
+				 see src/assembly/distribution.xml
+				 see http://maven.apache.org/plugins/maven-dependency-plugin/copy-mojo.html
 			<plugin>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<!-- copies a tightly-controlled set of dependencies into ${project.build.dir}/dependency
-					 in order to be added to the distribution jar during the assembly process.
-
-					 WARNING: any new dependencies added to project pom files over time must be added explicitly
-					 to this list if they are to make it into the distribution zip.  This section should be
-					 considered fragile. Ideally, we would use the 'copy-dependencies' goal of the
-					 maven-dependency-plugin, which automatically adds all project dependencies, but it does
-					 not offer enough fine-grained control over what jars are added and which are not.
-
-					 NOTE: an unfortunate side effect of this plugin is that it runs not just once, but for
-					 every module in the build.  This is annoying but harmless, and adds only a few seconds
-					 to the overall build time.  It also creates a false sense of size in the target directories
-					 but again this is probably negligible.
-
-					 see src/assembly/distribution.xml
-					 see http://maven.apache.org/plugins/maven-dependency-plugin/copy-mojo.html
-					 -->
 				<version>2.1</version>
 				<executions>
 					<execution>
@@ -369,117 +310,29 @@
 					</execution>
 				</executions>
 			</plugin>
+			-->
 			<plugin>
 				<!-- run `mvn package assembly:assembly` to trigger assembly creation.
 					 see http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html -->
 				<artifactId>maven-assembly-plugin</artifactId>
 				<version>2.2-beta-5</version>
 				<inherited>false</inherited>
-				<configuration>
-					<descriptors>
-						<descriptor>${project.basedir}/src/assembly/distribution.xml</descriptor>
-					</descriptors>
-					<appendAssemblyId>false</appendAssemblyId>
-				</configuration>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>com.springsource.bundlor</groupId>
-					<artifactId>com.springsource.bundlor.maven</artifactId>
-					<version>1.0.0.RELEASE</version>
 					<executions>
 						<execution>
-							<id>bundlor</id>
+							<id>distribution</id>
 							<goals>
-								<goal>bundlor</goal>
+								<goal>single</goal>
 							</goals>
+							<phase>package</phase>
+							<configuration>
+								<descriptors>
+									<descriptor>${project.basedir}/src/assembly/distribution.xml</descriptor>
+								</descriptors>
+								<appendAssemblyId>false</appendAssemblyId>
+							</configuration>
 						</execution>
 					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-antrun-plugin</artifactId>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.ant</groupId>
-							<artifactId>ant</artifactId>
-							<version>1.7.0</version>
-						</dependency>
-						<dependency>
-							<groupId>org.apache.ant</groupId>
-							<artifactId>ant-trax</artifactId>
-							<version>1.7.0</version>
-						</dependency>
-						<dependency>
-							<groupId>org.apache.ant</groupId>
-							<artifactId>ant-apache-regexp</artifactId>
-							<version>1.7.0</version>
-						</dependency>
-						<dependency>
-							<groupId>foundrylogic.vpp</groupId>
-							<artifactId>vpp</artifactId>
-							<version>2.2.1</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-	<reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.5</version>
-				<configuration>
-					<javadoc:aggregate>true</javadoc:aggregate>
-					<breakiterator>true</breakiterator>
-					<header>Spring Integration</header>
-					<source>1.5</source>
-					<quiet>true</quiet>
-					<javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>
-					<overview>${project.basedir}/src/main/javadoc/overview.html</overview>
-					<stylesheetfile>${project.basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
-					<!-- copies doc-files subdirectory which contains image resources -->
-					<docfilessubdirs>true</docfilessubdirs>
-					<groups>
-						<group>
-							<title>Spring Integration</title>
-							<packages>org.springframework.integration.core</packages>
-						</group>
-						<!-- TODO: fill in other groups -->
-					</groups>
-					<excludePackageNames>org.springframework.integration.samples</excludePackageNames>
-					<links>
-						<link>http://static.springframework.org/spring/docs/${org.springframework.version}/javadoc-api</link>
-						<link>http://java.sun.com/javase/6/docs/api</link>
-					</links>
-				</configuration>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>javadoc</report>
-						</reports>
-					</reportSet>
-				</reportSets>
 			</plugin>
 		</plugins>
-	</reporting>
-	<pluginRepositories>
-		<!-- necessary for bundlor and utils -->
-		<pluginRepository>
-			<id>repository.plugin.springsource.release</id>
-			<name>SpringSource Maven Repository</name>
-			<url>http://repository.springsource.com/maven/bundles/release</url>
-		</pluginRepository>
-	</pluginRepositories>
-	<dependencies>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${log4j.version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+	</build>
 </project>
diff --git a/spring-integration-core/pom.xml b/spring-integration-core/pom.xml
index fce8ccc538..db7706b46d 100644
--- a/spring-integration-core/pom.xml
+++ b/spring-integration-core/pom.xml
@@ -4,8 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-integration-core</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-integration-event/pom.xml b/spring-integration-event/pom.xml
index d3e91a0239..7147d95777 100644
--- a/spring-integration-event/pom.xml
+++ b/spring-integration-event/pom.xml
@@ -5,8 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-event</artifactId>
diff --git a/spring-integration-file/pom.xml b/spring-integration-file/pom.xml
index 13412f3594..7f6bd90473 100644
--- a/spring-integration-file/pom.xml
+++ b/spring-integration-file/pom.xml
@@ -5,8 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-file</artifactId>
diff --git a/spring-integration-http/pom.xml b/spring-integration-http/pom.xml
index f57efb0ecb..8ee7aaffce 100644
--- a/spring-integration-http/pom.xml
+++ b/spring-integration-http/pom.xml
@@ -5,8 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-http</artifactId>
diff --git a/spring-integration-httpinvoker/pom.xml b/spring-integration-httpinvoker/pom.xml
index 8306c9b543..a93592749a 100644
--- a/spring-integration-httpinvoker/pom.xml
+++ b/spring-integration-httpinvoker/pom.xml
@@ -5,8 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-httpinvoker</artifactId>
diff --git a/spring-integration-ip/pom.xml b/spring-integration-ip/pom.xml
index fa936416af..4851239396 100644
--- a/spring-integration-ip/pom.xml
+++ b/spring-integration-ip/pom.xml
@@ -5,8 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-ip</artifactId>
diff --git a/spring-integration-jdbc/pom.xml b/spring-integration-jdbc/pom.xml
index ceb812ded6..87e1b70439 100644
--- a/spring-integration-jdbc/pom.xml
+++ b/spring-integration-jdbc/pom.xml
@@ -4,8 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-integration-jdbc</artifactId>
 	<packaging>jar</packaging>
diff --git a/spring-integration-jms/pom.xml b/spring-integration-jms/pom.xml
index df878c2e27..fcd9e00aa5 100644
--- a/spring-integration-jms/pom.xml
+++ b/spring-integration-jms/pom.xml
@@ -5,8 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-jms</artifactId>
diff --git a/spring-integration-jmx/pom.xml b/spring-integration-jmx/pom.xml
index b9d007abb0..0cb15a1528 100644
--- a/spring-integration-jmx/pom.xml
+++ b/spring-integration-jmx/pom.xml
@@ -5,8 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-jmx</artifactId>
diff --git a/spring-integration-mail/pom.xml b/spring-integration-mail/pom.xml
index 513f14d3d9..f02a976c64 100644
--- a/spring-integration-mail/pom.xml
+++ b/spring-integration-mail/pom.xml
@@ -5,8 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-mail</artifactId>
diff --git a/spring-integration-parent/pom.xml b/spring-integration-parent/pom.xml
new file mode 100644
index 0000000000..cea6833715
--- /dev/null
+++ b/spring-integration-parent/pom.xml
@@ -0,0 +1,204 @@
+<?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-parent</artifactId>
+	<name>Spring Integration Parent</name>
+	<url>http://www.springsource.org/spring-integration</url>
+	<version>2.0.0.BUILD-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<!-- versions for commonly-used dependencies -->
+		<cglib.version>2.2</cglib.version>
+		<commons-logging.version>1.1.1</commons-logging.version>
+		<junit.version>4.7</junit.version>
+		<log4j.version>1.2.12</log4j.version>
+		<hsqldb.version>1.8.0.10</hsqldb.version>
+		<org.aspectj.version>1.6.5</org.aspectj.version>
+		<org.easymock.version>2.3</org.easymock.version>
+		<org.eclipse.jdt.core.version>3.4.2.v_883_R34x</org.eclipse.jdt.core.version>
+		<org.mockito.version>1.8.4</org.mockito.version>
+		<org.slf4j.version>1.5.10</org.slf4j.version>
+		<org.springframework.version>3.0.2.RELEASE</org.springframework.version>
+		<org.springframework.security.version>2.0.5.RELEASE</org.springframework.security.version>
+		<org.springframework.ws.version>1.5.8</org.springframework.ws.version>
+	</properties>
+	<profiles>
+		<profile>
+			<id>staging</id>
+			<distributionManagement>
+				<site>
+					<id>staging</id>
+					<url>file:///${java.io.tmpdir}/target/site</url>
+				</site>
+				<repository>
+					<id>staging</id>
+					<url>file:///${java.io.tmpdir}/target/repository</url>
+				</repository>
+				<snapshotRepository>
+					<id>staging</id>
+					<url>file:///${java.io.tmpdir}/target/snapshotRepository</url>
+				</snapshotRepository>
+			</distributionManagement>
+		</profile>
+	</profiles>
+	<build>
+		<extensions>
+			<extension>
+				<groupId>org.springframework.build.aws</groupId>
+				<artifactId>org.springframework.build.aws.maven</artifactId>
+				<version>2.0.0.RELEASE</version>
+			</extension>
+		</extensions>
+		<resources>
+			<resource>
+				<directory>${project.basedir}/src/main/java</directory>
+				<includes>
+					<include>**/*</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>${project.basedir}/src/main/resources</directory>
+				<includes>
+					<include>**/*</include>
+				</includes>
+			</resource>
+		</resources>
+		<testResources>
+			<testResource>
+				<directory>${project.basedir}/src/test/java</directory>
+				<includes>
+					<include>**/*</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</testResource>
+			<testResource>
+				<directory>${project.basedir}/src/test/resources</directory>
+				<includes>
+					<include>**/*</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</testResource>
+		</testResources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+					<compilerArgument>-Xlint:all</compilerArgument>
+					<showWarnings>true</showWarnings>
+					<showDeprecation>false</showDeprecation>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<useFile>false</useFile>
+					<includes>
+						<include>**/*Tests.java</include>
+					</includes>
+					<excludes>
+						<exclude>**/Abstract*.java</exclude>
+					</excludes>
+					<junitArtifactName>junit:junit</junitArtifactName>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>com.springsource.bundlor</groupId>
+					<artifactId>com.springsource.bundlor.maven</artifactId>
+					<version>1.0.0.RELEASE</version>
+					<executions>
+						<execution>
+							<id>bundlor</id>
+							<goals>
+								<goal>bundlor</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<dependencies>
+						<dependency>
+							<groupId>org.apache.ant</groupId>
+							<artifactId>ant</artifactId>
+							<version>1.7.0</version>
+						</dependency>
+						<dependency>
+							<groupId>org.apache.ant</groupId>
+							<artifactId>ant-trax</artifactId>
+							<version>1.7.0</version>
+						</dependency>
+						<dependency>
+							<groupId>org.apache.ant</groupId>
+							<artifactId>ant-apache-regexp</artifactId>
+							<version>1.7.0</version>
+						</dependency>
+						<dependency>
+							<groupId>foundrylogic.vpp</groupId>
+							<artifactId>vpp</artifactId>
+							<version>2.2.1</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+	<reporting>
+		<plugins>
+			<plugin>
+				<!-- significantly speeds up the 'Dependencies' report during site creation
+					 see http://old.nabble.com/Skipping-dependency-report-during-Maven2-site-generation-td20116761.html -->
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>2.1</version>
+				<configuration>
+					<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+	<pluginRepositories>
+		<!-- necessary for bundlor and utils -->
+		<pluginRepository>
+			<id>repository.plugin.springsource.release</id>
+			<name>SpringSource Maven Repository</name>
+			<url>http://repository.springsource.com/maven/bundles/release</url>
+		</pluginRepository>
+	</pluginRepositories>
+	<dependencies>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>${log4j.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/spring-integration-rmi/pom.xml b/spring-integration-rmi/pom.xml
index 29988fe376..517c425454 100644
--- a/spring-integration-rmi/pom.xml
+++ b/spring-integration-rmi/pom.xml
@@ -5,8 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-rmi</artifactId>
diff --git a/spring-integration-samples/helloworld/pom.xml b/spring-integration-samples/helloworld/pom.xml
index 9f5add6913..e58f56f264 100644
--- a/spring-integration-samples/helloworld/pom.xml
+++ b/spring-integration-samples/helloworld/pom.xml
@@ -6,7 +6,6 @@
 		<artifactId>spring-integration-samples</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<groupId>helloworld</groupId>
 	<artifactId>helloworld</artifactId>
 	<version>2.0.0.BUILD-SNAPSHOT</version>
 	<name>Spring Integration Hello World Sample</name>
diff --git a/spring-integration-samples/pom.xml b/spring-integration-samples/pom.xml
index a9a3004255..3c18c1b946 100644
--- a/spring-integration-samples/pom.xml
+++ b/spring-integration-samples/pom.xml
@@ -5,8 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>spring-integration-samples</artifactId>
diff --git a/spring-integration-security/pom.xml b/spring-integration-security/pom.xml
index 3ed4ebb6b3..e0210fec5d 100644
--- a/spring-integration-security/pom.xml
+++ b/spring-integration-security/pom.xml
@@ -5,8 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-security</artifactId>
diff --git a/spring-integration-stream/pom.xml b/spring-integration-stream/pom.xml
index b92558c8fb..1156d76838 100644
--- a/spring-integration-stream/pom.xml
+++ b/spring-integration-stream/pom.xml
@@ -5,8 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-stream</artifactId>
diff --git a/spring-integration-test/pom.xml b/spring-integration-test/pom.xml
index 14034d1faa..cb5ec7b3a4 100644
--- a/spring-integration-test/pom.xml
+++ b/spring-integration-test/pom.xml
@@ -5,8 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-test</artifactId>
diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml
index 0ccb9b61cc..a09f25e6df 100644
--- a/spring-integration-ws/pom.xml
+++ b/spring-integration-ws/pom.xml
@@ -5,8 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-ws</artifactId>
diff --git a/spring-integration-xml/pom.xml b/spring-integration-xml/pom.xml
index 763a64f9c0..657d207fa4 100644
--- a/spring-integration-xml/pom.xml
+++ b/spring-integration-xml/pom.xml
@@ -5,8 +5,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.integration</groupId>
-		<artifactId>spring-integration</artifactId>
+		<artifactId>spring-integration-parent</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-xml</artifactId>
diff --git a/src/main/scripts/build-distribution.sh b/src/main/scripts/build-distribution.sh
deleted file mode 100755
index bd41231e72..0000000000
--- a/src/main/scripts/build-distribution.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd `dirname $0`
-mvn -f ../../../pom.xml -Dmaven.test.skip=true clean package javadoc:aggregate docbkx:generate-pdf docbkx:generate-html assembly:assembly
-cd -