diff --git a/build-spring-integration/pom.xml b/build-spring-integration/pom.xml
index 6e619ce6d4..398b0462ab 100644
--- a/build-spring-integration/pom.xml
+++ b/build-spring-integration/pom.xml
@@ -3,25 +3,71 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.integration</groupId>
-  <artifactId>spring-integration-parent</artifactId>
+  <artifactId>spring-integration</artifactId>
   <name>Spring Integration</name>
+  <description>Spring Integration is a new addition to the Spring portfolio. It provides an
+    extension of the Spring programming model to support the well-known Enterprise Integration
+    Patterns while building on the Spring Framework's existing support for enterprise integration.
+    It enables simple messaging within Spring-based applications and integrates with external
+    systems via simple adapters. Those adapters provide a higher-level of abstraction over Spring's
+    support for remoting, messaging, and scheduling. Spring Integration's primary goal is to provide
+    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.2.RELEASE</version>
   <packaging>pom</packaging>
-
+  <modules> 
+      <module>../spring-integration-parent</module>
+      <module>../org.springframework.integration</module>
+      <module>../org.springframework.integration.security</module>
+      <module>../org.springframework.integration.adapter</module>
+      <module>../org.springframework.integration.event</module>
+      <module>../org.springframework.integration.file</module>
+      <module>../org.springframework.integration.http</module>
+      <module>../org.springframework.integration.httpinvoker</module>
+      <module>../org.springframework.integration.jms</module>
+      <module>../org.springframework.integration.mail</module>
+      <module>../org.springframework.integration.rmi</module>
+      <module>../org.springframework.integration.samples</module>
+      <module>../org.springframework.integration.stream</module>
+      <module>../org.springframework.integration.ws</module>
+      <module>../org.springframework.integration.xml</module>    
+  </modules>
+  <url>http://www.springsource.org/spring-integration</url>
+  <organization>
+    <name>SpringSource</name>
+    <url>http://www.springsource.com</url>
+  </organization>
+  <scm>
+    <url>https://fisheye.springframework.org/browse/spring-integration</url>
+    <connection>scm:svn:https://src.springframework.org/svn/spring-integration</connection>
+    <developerConnection>scm:svn:https://src.springframework.org/svn/spring-integration/trunk</developerConnection>
+  </scm>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>http://jira.springframework.org/browse/INT</url>
+  </issueManagement>
+  <mailingLists>
+    <mailingList>
+      <name>        Spring Integration Forum
+      </name>
+      <post>http://forum.springframework.org/forumdisplay.php?f=42</post>
+      <archive>http://forum.springframework.org/forumdisplay.php?f=42</archive>
+    </mailingList>
+  </mailingLists>
+  <ciManagement>
+    <system>Bamboo</system>
+    <url>https://build.springframework.org/browse/INT</url>
+  </ciManagement>
+  <licenses>
+    <license>
+      <name>        Apache 2.0
+      </name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+  
   <profiles>
-    <profile>
-      <id>strict</id>
-      <properties>
-        <maven.test.failure.ignore>false</maven.test.failure.ignore>
-      </properties>
-    </profile>
-    <profile>
-      <id>fast</id>
-      <properties>
-        <maven.test.skip>true</maven.test.skip>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-      </properties>
-    </profile>
     <profile>
       <id>staging</id>
       <distributionManagement>
@@ -58,30 +104,6 @@
       </build>
     </profile>
   </profiles>
-
-  <modules>
-    <module>../org.springframework.integration</module>
-    <module>../org.springframework.integration.security</module>
-    <module>../org.springframework.integration.adapter</module>
-    <module>../org.springframework.integration.event</module>
-    <module>../org.springframework.integration.file</module>
-    <module>../org.springframework.integration.http</module>
-    <module>../org.springframework.integration.httpinvoker</module>
-    <module>../org.springframework.integration.jms</module>
-    <module>../org.springframework.integration.mail</module>
-    <module>../org.springframework.integration.rmi</module>
-    <module>../org.springframework.integration.samples</module>
-    <module>../org.springframework.integration.stream</module>
-    <module>../org.springframework.integration.ws</module>
-    <module>../org.springframework.integration.xml</module>
-
-  </modules>
-
-  <url>http://www.springsource.org/spring-integration</url>
-  <organization>
-    <name>SpringSource</name>
-    <url>http://www.springsource.com</url>
-  </organization>
   <pluginRepositories>
     <pluginRepository>
       <id>com.springsource.repository.bundles.milestone</id>
@@ -104,24 +126,5 @@
       </snapshots>
     </pluginRepository>
   </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>glassfish</id>
-      <name> Glassfish Repository </name>
-      <url>http://download.java.net/maven/glassfish</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>com.springsource.repository.bundles.release</id>
-      <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
-    </repository>
-    <repository>
-      <id>com.springsource.repository.bundles.external</id>
-      <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-  </repositories>
+
 </project>
diff --git a/org.springframework.integration.adapter/pom.xml b/org.springframework.integration.adapter/pom.xml
index 9d77edde1a..c4058defbb 100644
--- a/org.springframework.integration.adapter/pom.xml
+++ b/org.springframework.integration.adapter/pom.xml
@@ -5,8 +5,19 @@
   <artifactId>spring-integration-adapter</artifactId>
   <packaging>jar</packaging>
   <name>Spring Integration Adapters</name>
-  <version>1.0.2.RELEASE</version>
+  <parent>
+    <groupId>org.springframework.integration</groupId>
+    <artifactId>spring-integration-parent</artifactId>
+    <version>1.0.2.RELEASE</version>
+    <relativePath>../spring-integration-parent</relativePath>
+  </parent>
   <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
@@ -20,5 +31,27 @@
       <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.event/pom.xml b/org.springframework.integration.event/pom.xml
index 3828902797..e866820890 100644
--- a/org.springframework.integration.event/pom.xml
+++ b/org.springframework.integration.event/pom.xml
@@ -4,9 +4,20 @@
   <groupId>org.springframework.integration</groupId>
   <artifactId>spring-integration-event</artifactId>
   <packaging>jar</packaging>
-  <name>Spring Integration Security Support</name>
-  <version>1.0.2.RELEASE</version>
+  <name>Spring Integration Event Support</name>
+  <parent>
+    <groupId>org.springframework.integration</groupId>
+    <artifactId>spring-integration-parent</artifactId>
+    <version>1.0.2.RELEASE</version>
+    <relativePath>../spring-integration-parent</relativePath>
+  </parent>
   <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
@@ -20,4 +31,27 @@
       <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.file/pom.xml b/org.springframework.integration.file/pom.xml
index 3aa0ef6bce..a12928e2ef 100644
--- a/org.springframework.integration.file/pom.xml
+++ b/org.springframework.integration.file/pom.xml
@@ -5,19 +5,83 @@
   <artifactId>spring-integration-file</artifactId>
   <packaging>jar</packaging>
   <name>Spring Integration File Adapters</name>
-  <version>1.0.2.RELEASE</version>
+  <parent>
+    <groupId>org.springframework.integration</groupId>
+    <artifactId>spring-integration-parent</artifactId>
+    <version>1.0.2.RELEASE</version>
+    <relativePath>../spring-integration-parent</relativePath>
+  </parent>
   <dependencies>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.1_3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>2.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymockclassextension</artifactId>
+      <version>2.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
       <version>2.5.6</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>2.5.6</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.6</version>
+      <scope>test</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.http/pom.xml b/org.springframework.integration.http/pom.xml
index e71cbec3d2..b0c582947c 100644
--- a/org.springframework.integration.http/pom.xml
+++ b/org.springframework.integration.http/pom.xml
@@ -9,7 +9,7 @@
     <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-parent</artifactId>
     <version>1.0.2.RELEASE</version>
-    <relativePath>../build-spring-integration</relativePath>
+    <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
     <dependency>
@@ -68,16 +68,26 @@
     </dependency>
   </dependencies>
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <junitArtifactName>junit:junit</junitArtifactName>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
+    <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.httpinvoker/pom.xml b/org.springframework.integration.httpinvoker/pom.xml
index ee35399d6b..417afdd8e4 100644
--- a/org.springframework.integration.httpinvoker/pom.xml
+++ b/org.springframework.integration.httpinvoker/pom.xml
@@ -5,7 +5,12 @@
   <artifactId>spring-integration-httpinvoker</artifactId>
   <packaging>jar</packaging>
   <name>Spring Integration HttpInvoker Support</name>
-  <version>1.0.2.RELEASE</version>
+  <parent>
+    <groupId>org.springframework.integration</groupId>
+    <artifactId>spring-integration-parent</artifactId>
+    <version>1.0.2.RELEASE</version>
+    <relativePath>../spring-integration-parent</relativePath>
+  </parent>
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -13,20 +18,64 @@
       <version>2.4</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>2.5.6</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>2.5.6</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
       <version>2.5.6</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
       <version>${project.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-adapter</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.jms/pom.xml b/org.springframework.integration.jms/pom.xml
index f0a59e1df6..bc41ed933a 100644
--- a/org.springframework.integration.jms/pom.xml
+++ b/org.springframework.integration.jms/pom.xml
@@ -5,33 +5,77 @@
   <artifactId>spring-integration-jms</artifactId>
   <packaging>jar</packaging>
   <name>Spring Integration JMS Support</name>
-  <version>1.0.2.RELEASE</version>
+  <parent>
+    <groupId>org.springframework.integration</groupId>
+    <artifactId>spring-integration-parent</artifactId>
+    <version>1.0.2.RELEASE</version>
+    <relativePath>../spring-integration-parent</relativePath>
+  </parent>
   <dependencies>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
+      <version>1.1</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>javax.jms</groupId>
       <artifactId>jms</artifactId>
       <version>1.1</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jms</artifactId>
       <version>2.5.6</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
       <version>2.5.6</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
       <version>${project.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-adapter</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.mail/pom.xml b/org.springframework.integration.mail/pom.xml
index cc038fcb94..342711f317 100644
--- a/org.springframework.integration.mail/pom.xml
+++ b/org.springframework.integration.mail/pom.xml
@@ -5,20 +5,61 @@
   <artifactId>spring-integration-mail</artifactId>
   <packaging>jar</packaging>
   <name>Spring Integration Mail Support</name>
-  <version>1.0.2.RELEASE</version>
+  <parent>
+    <groupId>org.springframework.integration</groupId>
+    <artifactId>spring-integration-parent</artifactId>
+    <version>1.0.2.RELEASE</version>
+    <relativePath>../spring-integration-parent</relativePath>
+  </parent>
   <dependencies>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.1.1</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
       <version>1.4.1</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.1_3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>2.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymockclassextension</artifactId>
+      <version>2.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
       <version>2.5.6</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>2.5.6</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
@@ -32,4 +73,27 @@
       <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.rmi/pom.xml b/org.springframework.integration.rmi/pom.xml
index e3791a6100..cdf8a1c32e 100644
--- a/org.springframework.integration.rmi/pom.xml
+++ b/org.springframework.integration.rmi/pom.xml
@@ -5,27 +5,71 @@
   <artifactId>spring-integration-rmi</artifactId>
   <packaging>jar</packaging>
   <name>Spring Integration RMI Support</name>
-  <version>1.0.2.RELEASE</version>
+  <parent>
+    <groupId>org.springframework.integration</groupId>
+    <artifactId>spring-integration-parent</artifactId>
+    <version>1.0.2.RELEASE</version>
+    <relativePath>../spring-integration-parent</relativePath>
+  </parent>
   <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
       <version>2.5.6</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
       <version>2.5.6</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>2.5.6</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
       <version>${project.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-adapter</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.samples/pom.xml b/org.springframework.integration.samples/pom.xml
index 20064a5e51..35237f1022 100644
--- a/org.springframework.integration.samples/pom.xml
+++ b/org.springframework.integration.samples/pom.xml
@@ -5,13 +5,17 @@
   <artifactId>spring-integration-samples</artifactId>
   <packaging>jar</packaging>
   <name>Spring Integration Samples</name>
-  <version>1.0.2.RELEASE</version>
+  <parent>
+    <groupId>org.springframework.integration</groupId>
+    <artifactId>spring-integration-parent</artifactId>
+    <version>1.0.2.RELEASE</version>
+    <relativePath>../spring-integration-parent</relativePath>
+  </parent>
   <dependencies>
     <dependency>
-      <!-- 1.1.1 is in S2 bundle repository, but it is not in apache maven central repo.  -->
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
-      <version>1.1</version>
+      <version>1.1.1</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -32,6 +36,12 @@
       <version>1.0.1</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
diff --git a/org.springframework.integration.security/pom.xml b/org.springframework.integration.security/pom.xml
index c049b35ff9..74cce3fa2b 100644
--- a/org.springframework.integration.security/pom.xml
+++ b/org.springframework.integration.security/pom.xml
@@ -9,7 +9,7 @@
     <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-parent</artifactId>
     <version>1.0.2.RELEASE</version>
-    <relativePath>../build-spring-integration</relativePath>
+    <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
     <dependency>
@@ -56,16 +56,26 @@
     </dependency>
   </dependencies>
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <junitArtifactName>junit:junit</junitArtifactName>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
+    <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.stream/pom.xml b/org.springframework.integration.stream/pom.xml
index db70264214..6205609a55 100644
--- a/org.springframework.integration.stream/pom.xml
+++ b/org.springframework.integration.stream/pom.xml
@@ -5,12 +5,30 @@
   <artifactId>spring-integration-stream</artifactId>
   <packaging>jar</packaging>
   <name>Spring Integration Stream Support</name>
-  <version>1.0.2.RELEASE</version>
+  <parent>
+    <groupId>org.springframework.integration</groupId>
+    <artifactId>spring-integration-parent</artifactId>
+    <version>1.0.2.RELEASE</version>
+    <relativePath>../spring-integration-parent</relativePath>
+  </parent>
   <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
       <version>2.5.6</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>2.5.6</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
@@ -19,4 +37,27 @@
       <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 5c2da784f3..698a66f75a 100644
--- a/org.springframework.integration.ws/pom.xml
+++ b/org.springframework.integration.ws/pom.xml
@@ -9,7 +9,7 @@
     <groupId>org.springframework.integration</groupId>
     <artifactId>spring-integration-parent</artifactId>
     <version>1.0.2.RELEASE</version>
-    <relativePath>../build-spring-integration</relativePath>
+    <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
     <dependency>
@@ -34,16 +34,66 @@
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-adapter</artifactId>
       <version>${project.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.ws</groupId>
       <artifactId>spring-oxm</artifactId>
       <version>1.5.5</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.ws</groupId>
       <artifactId>spring-ws-core</artifactId>
       <version>1.5.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>2.5.6</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.6</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>2.5.6</version>
+      <scope>test</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.xml/pom.xml b/org.springframework.integration.xml/pom.xml
index 7b8203365a..82d834eabe 100644
--- a/org.springframework.integration.xml/pom.xml
+++ b/org.springframework.integration.xml/pom.xml
@@ -5,13 +5,25 @@
   <artifactId>spring-integration-xml</artifactId>
   <packaging>jar</packaging>
   <name>Spring Integration XML Support</name>
-  <version>1.0.2.RELEASE</version>
+  <parent>
+    <groupId>org.springframework.integration</groupId>
+    <artifactId>spring-integration-parent</artifactId>
+    <version>1.0.2.RELEASE</version>
+    <relativePath>../spring-integration-parent</relativePath>
+  </parent>
   <dependencies>
+    <!--
+    <dependency>
+      <groupId>com.sun.xml</groupId>
+      <artifactId>com.sun.xml.bind</artifactId>
+      <version>2.1.7</version>
+      <scope>test</scope>
+    </dependency>
+    -->
     <dependency>
-      <!-- 1.1.1 is in S2 bundle repository, but it is not in apache maven central repo.  -->
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
-      <version>1.1</version>
+      <version>1.1.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -27,20 +39,72 @@
       <version>1.2.0</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <version>1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
       <version>2.5.6</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>2.5.6</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
       <version>${project.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.ws</groupId>
       <artifactId>spring-oxm-tiger</artifactId>
       <version>1.5.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.ws</groupId>
+      <artifactId>spring-oxm</artifactId>
+      <version>1.5.5</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <testResources>
+      <testResource>
+        <directory>src/test/java</directory>
+        <includes>
+          <include>**/*.xml</include>
+          <include>**/*.xsl</include>
+          <include>**/*.xsd</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/pom.xml b/org.springframework.integration/pom.xml
index 5cce0fd86e..07c166a8dc 100644
--- a/org.springframework.integration/pom.xml
+++ b/org.springframework.integration/pom.xml
@@ -1,20 +1,41 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.integration</groupId>
 	<artifactId>spring-integration-core</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Integration Core</name>
-	<version>1.0.2.RELEASE</version>
+	<parent>
+		<groupId>org.springframework.integration</groupId>
+		<artifactId>spring-integration-parent</artifactId>
+		<version>1.0.2.RELEASE</version>
+		<relativePath>../spring-integration-parent</relativePath>
+	</parent>
 	<dependencies>
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib</artifactId>
+			<version>2.1_3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.easymock</groupId>
+			<artifactId>easymock</artifactId>
+			<version>2.3</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aop</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
-		<dependency>
+			<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 			<version>${spring.version}</version>
@@ -24,8 +45,20 @@
 			<artifactId>spring-tx</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${spring.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+		       <groupId>org.mockito</groupId>
+		       <artifactId>mockito-all</artifactId>
+		       <version>1.6</version>
+		       <scope>test</scope>
+		</dependency>
 	</dependencies>
 	<properties>
 		<spring.version>2.5.6</spring.version>
 	</properties>
-</project>
+</project>
\ No newline at end of file
diff --git a/spring-integration-parent/pom.xml b/spring-integration-parent/pom.xml
new file mode 100644
index 0000000000..be07638bbf
--- /dev/null
+++ b/spring-integration-parent/pom.xml
@@ -0,0 +1,184 @@
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.springframework.integration</groupId>
+  <artifactId>spring-integration-parent</artifactId>
+  <version>1.0.2.RELEASE</version>
+  <name> Spring Integration Parent </name>
+  <url>http://www.springsource.org/spring-integration</url>
+  <description> Spring Integration parent project. Defines dependencies and common configuration for
+    the build process. </description>
+  <packaging>pom</packaging>
+  <properties>
+    <org.eclipse.jdt.core.version>3.4.2.v_883_R34x</org.eclipse.jdt.core.version>
+  </properties>
+  <profiles>
+    <profile>
+      <id>strict</id>
+      <properties>
+        <maven.test.failure.ignore>false</maven.test.failure.ignore>
+      </properties>
+    </profile>
+    <profile>
+      <id>fast</id>
+      <properties>
+        <maven.test.skip>true</maven.test.skip>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+      </properties>
+    </profile>
+    <profile>
+      <id>staging</id>
+      <distributionManagement>
+        <site>
+          <id>staging</id>
+          <url>file:///${user.dir}/target/staging</url>
+        </site>
+        <repository>
+          <id>staging</id>
+          <url>file:///${user.dir}/target/staging</url>
+        </repository>
+        <snapshotRepository>
+          <id>staging</id>
+          <url>file:///${user.dir}/target/staging</url>
+        </snapshotRepository>
+      </distributionManagement>
+    </profile>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-source-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  <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>
+    </testResources>
+    <plugins>
+      
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId> 
+        <artifactId>maven-compiler-plugin</artifactId> 
+        <configuration> 
+          <source>1.5</source> 
+          <target>1.5</target>
+        </configuration>
+        </plugin>
+        
+      <!--
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+          <compilerVersion>1.6</compilerVersion>
+          <fork>true</fork>
+          <executable>java -jar "${env.M2_REPO_C}/org/eclipse/jdt/core/${org.eclipse.jdt.core.version}/core-${org.eclipse.jdt.core.version}.jar"   -classpath rt.jar -sourcepath "src/main"</executable>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>core</artifactId>
+            <version>${org.eclipse.jdt.core.version}</version>
+          </dependency>
+        </dependencies>
+      </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>
+            <exclude>**/PropertyPlaceholderTests.java</exclude>
+          </excludes>
+          <junitArtifactName>junit:junit</junitArtifactName>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <repositories>
+    <repository>
+      <id>glassfish</id>
+      <name> Glassfish Repository </name>
+      <url>http://download.java.net/maven/glassfish</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>jboss</id>
+      <name>JBoss Repository</name>
+      <url>http://repository.jboss.org/maven2</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>com.springsource.repository.bundles.release</id>
+      <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+      <url>http://repository.springsource.com/maven/bundles/release</url>
+    </repository>
+    <repository>
+      <id>com.springsource.repository.bundles.external</id>
+      <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+      <url>http://repository.springsource.com/maven/bundles/external</url>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>com.springsource.repository.bundles.milestone</id>
+      <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
+      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </pluginRepository>
+    <pluginRepository>
+      <id>com.springsource.repository.bundles.snapshot</id>
+      <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Snapshots</name>
+      <url>http://repository.springsource.com/maven/bundles/snapshot</url>
+    </pluginRepository>
+    <pluginRepository>
+      <id>agilejava</id>
+      <url>http://agilejava.com/maven</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+</project>