From f1d3831314889502ce15b3ee5117da4000a687e0 Mon Sep 17 00:00:00 2001
From: Soby Chacko <schacko@pivotal.io>
Date: Fri, 6 May 2016 16:35:28 -0400
Subject: [PATCH] Remove duplicate SCS and SI-test dependencies

All the starters were individually having SCS and SI test dependencies.
Moving them to the parent

Polishing according PR comments

* Add repo for Gemfire into `.setting.xml`
* Move deps version properties into the `spring-cloud-stream-app-dependencies` module
* Clean up some dependencies in the modules
---
 .settings.xml                                 | 141 ++++----
 .../app-starters-annotation-common/pom.xml    |  15 -
 .../app-starters-file-common/pom.xml          |  13 -
 .../app-starters-ftp-common/pom.xml           |  15 -
 .../app-starters-metrics-common/pom.xml       |  15 -
 .../app-starters-script-common/pom.xml        |  13 -
 .../app-starters-sftp-common/pom.xml          |  15 -
 .../app-starters-tcp-common/pom.xml           |  13 -
 .../app-starters-time-common/pom.xml          |  15 -
 .../app-starters-trigger-common/pom.xml       |  15 -
 .../app-starters-twitter-common/pom.xml       |  13 -
 app-starters-common/pom.xml                   |   7 +
 .../pom.xml                                   |  12 -
 .../pom.xml                                   |  15 -
 .../pom.xml                                   |  12 -
 .../pom.xml                                   |  14 -
 .../pom.xml                                   |  24 --
 .../pom.xml                                   |  26 +-
 .../pom.xml                                   |  16 -
 .../pom.xml                                   |  16 -
 .../pom.xml                                   |  16 -
 .../pom.xml                                   |  16 -
 .../pom.xml                                   |  21 --
 .../pom.xml                                   |  20 --
 .../pom.xml                                   |  15 -
 .../pom.xml                                   |  12 -
 .../pom.xml                                   |  14 -
 .../pom.xml                                   |  22 --
 .../pom.xml                                   |  18 -
 .../pom.xml                                   |  23 --
 .../pom.xml                                   |  22 --
 .../pom.xml                                   |  23 --
 pom.xml                                       | 318 +++++++++---------
 .../pom.xml                                   |  17 -
 .../pom.xml                                   |  17 -
 .../pom.xml                                   |  16 -
 .../pom.xml                                   |  16 -
 .../pom.xml                                   |  16 -
 .../pom.xml                                   |  21 +-
 .../pom.xml                                   |  19 --
 .../pom.xml                                   |  16 -
 .../pom.xml                                   |  17 -
 .../pom.xml                                   |  20 --
 .../pom.xml                                   |  19 --
 .../pom.xml                                   |  12 -
 .../pom.xml                                   |  16 -
 .../pom.xml                                   |  24 --
 .../pom.xml                                   |  25 --
 spring-cloud-stream-app-dependencies/pom.xml  |   9 +-
 .../pom.xml                                   |  12 -
 .../pom.xml                                   |  18 -
 .../pom.xml                                   |  23 --
 .../pom.xml                                   |  17 -
 .../pom.xml                                   |  21 --
 .../pom.xml                                   |  21 --
 .../pom.xml                                   |   5 -
 .../pom.xml                                   |   4 -
 .../pom.xml                                   |   6 -
 .../pom.xml                                   |  27 --
 59 files changed, 262 insertions(+), 1137 deletions(-)

diff --git a/.settings.xml b/.settings.xml
index 6c355129e..60305ce2f 100644
--- a/.settings.xml
+++ b/.settings.xml
@@ -1,66 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
-  <servers>
-	<server>
-	  <id>repo.spring.io</id>
-	  <username>${env.CI_DEPLOY_USERNAME}</username>
-	  <password>${env.CI_DEPLOY_PASSWORD}</password>
-	</server>
-  </servers>
-  <profiles>
-	<profile>
-      <!--
-          N.B. this profile is only here to support users and IDEs that do not use Maven 3.3. 
-          It isn't needed on the command line if you use the wrapper script (mvnw) or if you use 
-          a native Maven with the right version. Eclipse users should points their Maven tooling to
-          this settings file, or copy the profile into their ~/.m2/settings.xml.
-      -->
-	  <id>spring</id>
-	  <activation><activeByDefault>true</activeByDefault></activation>
-	  <repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>http://repo.spring.io/libs-snapshot-local</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>http://repo.spring.io/libs-milestone-local</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-releases</id>
-			<name>Spring Releases</name>
-			<url>http://repo.spring.io/release</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	  </repositories>
-	  <pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>http://repo.spring.io/libs-snapshot-local</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>http://repo.spring.io/libs-milestone-local</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	  </pluginRepositories>
-    </profile>
-  </profiles>
+	<servers>
+		<server>
+			<id>repo.spring.io</id>
+			<username>${env.CI_DEPLOY_USERNAME}</username>
+			<password>${env.CI_DEPLOY_PASSWORD}</password>
+		</server>
+	</servers>
+	<profiles>
+		<profile>
+			<!--
+				N.B. this profile is only here to support users and IDEs that do not use Maven 3.3.
+				It isn't needed on the command line if you use the wrapper script (mvnw) or if you use
+				a native Maven with the right version. Eclipse users should points their Maven tooling to
+				this settings file, or copy the profile into their ~/.m2/settings.xml.
+			-->
+			<id>spring</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<repositories>
+				<repository>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>http://repo.spring.io/libs-snapshot-local</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>http://repo.spring.io/libs-milestone-local</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-releases</id>
+					<name>Spring Releases</name>
+					<url>http://repo.spring.io/release</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+				<!-- Gemstone repository is needed since gemfire libs
+			  are not hosted in mvn central.  Note that the libs
+			  are also hosted and browsable at
+			  https://repo.spring.io/gemstone-release-cache -->
+				<repository>
+					<id>gemstone-release</id>
+					<name>GemStone Maven Release Repository</name>
+					<url>http://dist.gemstone.com/maven/release</url>
+					<snapshots>
+						<enabled>true</enabled>
+						<updatePolicy>always</updatePolicy>
+					</snapshots>
+				</repository>
+			</repositories>
+			<pluginRepositories>
+				<pluginRepository>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>http://repo.spring.io/libs-snapshot-local</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</pluginRepository>
+				<pluginRepository>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>http://repo.spring.io/libs-milestone-local</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</pluginRepository>
+			</pluginRepositories>
+		</profile>
+	</profiles>
 </settings>
diff --git a/app-starters-common/app-starters-annotation-common/pom.xml b/app-starters-common/app-starters-annotation-common/pom.xml
index 6edf1fbbe..9614ff56c 100644
--- a/app-starters-common/app-starters-annotation-common/pom.xml
+++ b/app-starters-common/app-starters-annotation-common/pom.xml
@@ -10,19 +10,4 @@
 	<artifactId>app-starters-annotation-common</artifactId>
 	<name>app-starters-annotation-common</name>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-			<version>${spring-cloud-stream.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-java-dsl</artifactId>
-			<version>${spring-integration-java-dsl.version}</version>
-		</dependency>
-
-	</dependencies>
-
 </project>
diff --git a/app-starters-common/app-starters-file-common/pom.xml b/app-starters-common/app-starters-file-common/pom.xml
index 08a8fa4f3..c4a8ddd37 100644
--- a/app-starters-common/app-starters-file-common/pom.xml
+++ b/app-starters-common/app-starters-file-common/pom.xml
@@ -11,24 +11,11 @@
 	<name>app-starters-file-common</name>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-			<version>${spring-cloud-stream.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-java-dsl</artifactId>
-			<version>1.1.2.RELEASE</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-file</artifactId>
 			<optional>true</optional>
 		</dependency>
-
 	</dependencies>
 
 </project>
diff --git a/app-starters-common/app-starters-ftp-common/pom.xml b/app-starters-common/app-starters-ftp-common/pom.xml
index b17c8caed..ef73a3fe9 100644
--- a/app-starters-common/app-starters-ftp-common/pom.xml
+++ b/app-starters-common/app-starters-ftp-common/pom.xml
@@ -11,30 +11,15 @@
 	<name>app-starters-ftp-common</name>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-			<version>${spring-cloud-stream.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-java-dsl</artifactId>
-			<version>1.1.2.RELEASE</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-ftp</artifactId>
 			<optional>true</optional>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-file-common</artifactId>
-			<version>1.0.0.BUILD-SNAPSHOT</version>
 		</dependency>
-
 	</dependencies>
 
 </project>
diff --git a/app-starters-common/app-starters-metrics-common/pom.xml b/app-starters-common/app-starters-metrics-common/pom.xml
index ec7c70929..ed9f1dac7 100644
--- a/app-starters-common/app-starters-metrics-common/pom.xml
+++ b/app-starters-common/app-starters-metrics-common/pom.xml
@@ -10,19 +10,4 @@
 	<artifactId>app-starters-metrics-common</artifactId>
 	<name>app-starters-metrics-common</name>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-			<version>${spring-cloud-stream.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-java-dsl</artifactId>
-			<version>1.1.2.RELEASE</version>
-		</dependency>
-
-	</dependencies>
-
 </project>
diff --git a/app-starters-common/app-starters-script-common/pom.xml b/app-starters-common/app-starters-script-common/pom.xml
index debd882d5..d80fd8c50 100644
--- a/app-starters-common/app-starters-script-common/pom.xml
+++ b/app-starters-common/app-starters-script-common/pom.xml
@@ -11,24 +11,11 @@
 	<name>app-starters-script-common</name>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-			<version>${spring-cloud-stream.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-java-dsl</artifactId>
-			<version>1.1.2.RELEASE</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-groovy</artifactId>
 			<optional>true</optional>
 		</dependency>
-
 	</dependencies>
 
 </project>
diff --git a/app-starters-common/app-starters-sftp-common/pom.xml b/app-starters-common/app-starters-sftp-common/pom.xml
index 5b9e68d55..ab67f6bf9 100644
--- a/app-starters-common/app-starters-sftp-common/pom.xml
+++ b/app-starters-common/app-starters-sftp-common/pom.xml
@@ -11,30 +11,15 @@
 	<name>app-starters-sftp-common</name>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-			<version>${spring-cloud-stream.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-java-dsl</artifactId>
-			<version>1.1.2.RELEASE</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-sftp</artifactId>
 			<optional>true</optional>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-file-common</artifactId>
-			<version>1.0.0.BUILD-SNAPSHOT</version>
 		</dependency>
-
 	</dependencies>
 
 </project>
diff --git a/app-starters-common/app-starters-tcp-common/pom.xml b/app-starters-common/app-starters-tcp-common/pom.xml
index 709225839..4756378a2 100644
--- a/app-starters-common/app-starters-tcp-common/pom.xml
+++ b/app-starters-common/app-starters-tcp-common/pom.xml
@@ -11,24 +11,11 @@
 	<name>app-starters-tcp-common</name>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-			<version>${spring-cloud-stream.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-java-dsl</artifactId>
-			<version>1.1.2.RELEASE</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-ip</artifactId>
 			<optional>true</optional>
 		</dependency>
-
 	</dependencies>
 
 </project>
diff --git a/app-starters-common/app-starters-time-common/pom.xml b/app-starters-common/app-starters-time-common/pom.xml
index 7a9e53fbc..14707748d 100644
--- a/app-starters-common/app-starters-time-common/pom.xml
+++ b/app-starters-common/app-starters-time-common/pom.xml
@@ -10,19 +10,4 @@
 	<artifactId>app-starters-time-common</artifactId>
 	<name>app-starters-time-common</name>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-			<version>${spring-cloud-stream.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-java-dsl</artifactId>
-			<version>1.1.2.RELEASE</version>
-		</dependency>
-
-	</dependencies>
-
 </project>
diff --git a/app-starters-common/app-starters-trigger-common/pom.xml b/app-starters-common/app-starters-trigger-common/pom.xml
index f10b6f01d..b042d36b2 100644
--- a/app-starters-common/app-starters-trigger-common/pom.xml
+++ b/app-starters-common/app-starters-trigger-common/pom.xml
@@ -11,19 +11,4 @@
 	<packaging>jar</packaging>
 	<name>app-starters-trigger-common</name>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-			<version>${spring-cloud-stream.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-java-dsl</artifactId>
-			<version>1.1.2.RELEASE</version>
-		</dependency>
-
-	</dependencies>
-
 </project>
diff --git a/app-starters-common/app-starters-twitter-common/pom.xml b/app-starters-common/app-starters-twitter-common/pom.xml
index 77a535533..7b6da323a 100644
--- a/app-starters-common/app-starters-twitter-common/pom.xml
+++ b/app-starters-common/app-starters-twitter-common/pom.xml
@@ -11,24 +11,11 @@
 	<name>app-starters-twitter-common</name>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-			<version>${spring-cloud-stream.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-java-dsl</artifactId>
-			<version>1.1.2.RELEASE</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-ip</artifactId>
 			<optional>true</optional>
 		</dependency>
-
 	</dependencies>
 
 </project>
diff --git a/app-starters-common/pom.xml b/app-starters-common/pom.xml
index f4092e2ea..b0c711b88 100644
--- a/app-starters-common/pom.xml
+++ b/app-starters-common/pom.xml
@@ -24,4 +24,11 @@
 		<module>app-starters-twitter-common</module>
 	</modules>
 
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-java-dsl</artifactId>
+		</dependency>
+	</dependencies>
+
 </project>
diff --git a/cassandra/spring-cloud-starter-stream-sink-cassandra/pom.xml b/cassandra/spring-cloud-starter-stream-sink-cassandra/pom.xml
index 2e69a3018..2edbda3cc 100644
--- a/cassandra/spring-cloud-starter-stream-sink-cassandra/pom.xml
+++ b/cassandra/spring-cloud-starter-stream-sink-cassandra/pom.xml
@@ -26,17 +26,5 @@
 			<groupId>org.cassandraunit</groupId>
 			<artifactId>cassandra-unit-spring</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/cloudfoundry/spring-cloud-starter-stream-source-loggregator/pom.xml b/cloudfoundry/spring-cloud-starter-stream-source-loggregator/pom.xml
index 29c9c1b4c..45dbfd6d5 100644
--- a/cloudfoundry/spring-cloud-starter-stream-source-loggregator/pom.xml
+++ b/cloudfoundry/spring-cloud-starter-stream-source-loggregator/pom.xml
@@ -14,24 +14,9 @@
 	</parent>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.cloudfoundry</groupId>
 			<artifactId>cloudfoundry-client-lib</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/file/spring-cloud-starter-stream-sink-file/pom.xml b/file/spring-cloud-starter-stream-sink-file/pom.xml
index 3c069573d..03598c71b 100644
--- a/file/spring-cloud-starter-stream-sink-file/pom.xml
+++ b/file/spring-cloud-starter-stream-sink-file/pom.xml
@@ -18,17 +18,5 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-file</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/file/spring-cloud-starter-stream-source-file/pom.xml b/file/spring-cloud-starter-stream-source-file/pom.xml
index b984b2daf..146072431 100644
--- a/file/spring-cloud-starter-stream-source-file/pom.xml
+++ b/file/spring-cloud-starter-stream-source-file/pom.xml
@@ -30,19 +30,5 @@
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-trigger-common</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/ftp/spring-cloud-starter-stream-sink-ftp/pom.xml b/ftp/spring-cloud-starter-stream-sink-ftp/pom.xml
index 3ed16aa6e..a16c04b8c 100644
--- a/ftp/spring-cloud-starter-stream-sink-ftp/pom.xml
+++ b/ftp/spring-cloud-starter-stream-sink-ftp/pom.xml
@@ -18,41 +18,17 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-ftp</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-ftp-common</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-test-support</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.ftpserver</groupId>
 			<artifactId>ftpserver-core</artifactId>
 		</dependency>
-
 	</dependencies>
 </project>
diff --git a/ftp/spring-cloud-starter-stream-source-ftp/pom.xml b/ftp/spring-cloud-starter-stream-source-ftp/pom.xml
index 0ace590c5..254d8bc53 100644
--- a/ftp/spring-cloud-starter-stream-source-ftp/pom.xml
+++ b/ftp/spring-cloud-starter-stream-source-ftp/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-starter-stream-source-ftp</artifactId>
@@ -18,12 +19,10 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-ftp</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-java-dsl</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-ftp-common</artifactId>
@@ -32,34 +31,13 @@
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-trigger-common</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-test-support</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.ftpserver</groupId>
 			<artifactId>ftpserver-core</artifactId>
 		</dependency>
-
 	</dependencies>
 </project>
diff --git a/gemfire/spring-cloud-starter-stream-sink-gemfire/pom.xml b/gemfire/spring-cloud-starter-stream-sink-gemfire/pom.xml
index 4684c21a9..2f4dd50bf 100644
--- a/gemfire/spring-cloud-starter-stream-sink-gemfire/pom.xml
+++ b/gemfire/spring-cloud-starter-stream-sink-gemfire/pom.xml
@@ -20,25 +20,9 @@
             <artifactId>spring-integration-gemfire</artifactId>
         </dependency>
 		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-java-dsl</artifactId>
-		</dependency>
-		<dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-test</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
         </dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-test-support</artifactId>
diff --git a/gemfire/spring-cloud-starter-stream-source-gemfire-cq/pom.xml b/gemfire/spring-cloud-starter-stream-source-gemfire-cq/pom.xml
index b8a367510..2d2d5b60b 100644
--- a/gemfire/spring-cloud-starter-stream-source-gemfire-cq/pom.xml
+++ b/gemfire/spring-cloud-starter-stream-source-gemfire-cq/pom.xml
@@ -19,25 +19,10 @@
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-gemfire</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-test</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-stream</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-stream-test-support</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.cloud.stream.app</groupId>
             <artifactId>app-starters-test-support</artifactId>
@@ -46,6 +31,5 @@
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-java-dsl</artifactId>
         </dependency>
-
     </dependencies>
 </project>
diff --git a/gemfire/spring-cloud-starter-stream-source-gemfire/pom.xml b/gemfire/spring-cloud-starter-stream-source-gemfire/pom.xml
index ce315db25..a9d0c8155 100644
--- a/gemfire/spring-cloud-starter-stream-source-gemfire/pom.xml
+++ b/gemfire/spring-cloud-starter-stream-source-gemfire/pom.xml
@@ -19,25 +19,10 @@
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-gemfire</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-test</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-stream</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-stream-test-support</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.cloud.stream.app</groupId>
             <artifactId>app-starters-test-support</artifactId>
@@ -46,6 +31,5 @@
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-java-dsl</artifactId>
         </dependency>
-
     </dependencies>
 </project>
diff --git a/gpfdist/spring-cloud-starter-stream-sink-gpfdist/pom.xml b/gpfdist/spring-cloud-starter-stream-sink-gpfdist/pom.xml
index 924548ab0..1a467288e 100644
--- a/gpfdist/spring-cloud-starter-stream-sink-gpfdist/pom.xml
+++ b/gpfdist/spring-cloud-starter-stream-sink-gpfdist/pom.xml
@@ -45,22 +45,6 @@
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-hadoop-util</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-test-support</artifactId>
diff --git a/hdfs/spring-cloud-starter-stream-sink-hdfs-dataset/pom.xml b/hdfs/spring-cloud-starter-stream-sink-hdfs-dataset/pom.xml
index 50fdd3afb..4b38847be 100644
--- a/hdfs/spring-cloud-starter-stream-sink-hdfs-dataset/pom.xml
+++ b/hdfs/spring-cloud-starter-stream-sink-hdfs-dataset/pom.xml
@@ -20,27 +20,6 @@
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-hadoop-store</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.xerial.snappy</groupId>
 			<artifactId>snappy-java</artifactId>
diff --git a/hdfs/spring-cloud-starter-stream-sink-hdfs/pom.xml b/hdfs/spring-cloud-starter-stream-sink-hdfs/pom.xml
index 06aa33ad4..804b07b88 100644
--- a/hdfs/spring-cloud-starter-stream-sink-hdfs/pom.xml
+++ b/hdfs/spring-cloud-starter-stream-sink-hdfs/pom.xml
@@ -20,25 +20,5 @@
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-hadoop-store</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/http/spring-cloud-starter-stream-source-http/pom.xml b/http/spring-cloud-starter-stream-source-http/pom.xml
index 11b92d783..80765605f 100644
--- a/http/spring-cloud-starter-stream-source-http/pom.xml
+++ b/http/spring-cloud-starter-stream-source-http/pom.xml
@@ -14,24 +14,9 @@
 	</parent>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/jdbc/spring-cloud-starter-stream-sink-jdbc/pom.xml b/jdbc/spring-cloud-starter-stream-sink-jdbc/pom.xml
index d6bc64c3b..23232c49f 100644
--- a/jdbc/spring-cloud-starter-stream-sink-jdbc/pom.xml
+++ b/jdbc/spring-cloud-starter-stream-sink-jdbc/pom.xml
@@ -21,17 +21,5 @@
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/jdbc/spring-cloud-starter-stream-source-jdbc/pom.xml b/jdbc/spring-cloud-starter-stream-source-jdbc/pom.xml
index 731bec5c1..d47e282a9 100644
--- a/jdbc/spring-cloud-starter-stream-source-jdbc/pom.xml
+++ b/jdbc/spring-cloud-starter-stream-source-jdbc/pom.xml
@@ -13,7 +13,6 @@
 	</parent>
 
 	<dependencies>
-
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-java-dsl</artifactId>
@@ -26,22 +25,9 @@
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-trigger-common</artifactId>
 		</dependency>
-
 	</dependencies>
 </project>
diff --git a/jms/spring-cloud-starter-stream-source-jms/pom.xml b/jms/spring-cloud-starter-stream-source-jms/pom.xml
index 670afb81f..aad5177a7 100644
--- a/jms/spring-cloud-starter-stream-source-jms/pom.xml
+++ b/jms/spring-cloud-starter-stream-source-jms/pom.xml
@@ -22,36 +22,14 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-java-dsl</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>javax.jms</groupId>
 			<artifactId>jms-api</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>activemq-broker</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
 </project>
diff --git a/log/spring-cloud-starter-stream-sink-log/pom.xml b/log/spring-cloud-starter-stream-sink-log/pom.xml
index 7b803d437..9f767eb26 100644
--- a/log/spring-cloud-starter-stream-sink-log/pom.xml
+++ b/log/spring-cloud-starter-stream-sink-log/pom.xml
@@ -11,22 +11,4 @@
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-	</dependencies>
-
-
 </project>
diff --git a/metrics/spring-cloud-starter-stream-sink-aggregate-counter/pom.xml b/metrics/spring-cloud-starter-stream-sink-aggregate-counter/pom.xml
index c8968fb69..4300de37d 100644
--- a/metrics/spring-cloud-starter-stream-sink-aggregate-counter/pom.xml
+++ b/metrics/spring-cloud-starter-stream-sink-aggregate-counter/pom.xml
@@ -12,45 +12,22 @@
 	</parent>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-metrics-common</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-common-analytics</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-redis</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-time-common</artifactId>
 		</dependency>
 	</dependencies>
 
-
 </project>
diff --git a/metrics/spring-cloud-starter-stream-sink-counter/pom.xml b/metrics/spring-cloud-starter-stream-sink-counter/pom.xml
index 0bb78744b..5a3346583 100644
--- a/metrics/spring-cloud-starter-stream-sink-counter/pom.xml
+++ b/metrics/spring-cloud-starter-stream-sink-counter/pom.xml
@@ -12,36 +12,14 @@
 	</parent>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-metrics-common</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-redis</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
 	</dependencies>
 
-
 </project>
diff --git a/metrics/spring-cloud-starter-stream-sink-field-value-counter/pom.xml b/metrics/spring-cloud-starter-stream-sink-field-value-counter/pom.xml
index 1dd59fa56..f86db7d34 100644
--- a/metrics/spring-cloud-starter-stream-sink-field-value-counter/pom.xml
+++ b/metrics/spring-cloud-starter-stream-sink-field-value-counter/pom.xml
@@ -12,41 +12,18 @@
 	</parent>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-metrics-common</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-common-analytics</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-redis</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
 	</dependencies>
 
-
 </project>
diff --git a/pom.xml b/pom.xml
index 5308f0f73..f640b557e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-build</artifactId>
-    <version>1.1.0.RC1</version>
-    <relativePath />
-  </parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-build</artifactId>
+		<version>1.1.0.RC1</version>
+		<relativePath/>
+	</parent>
 
-  <groupId>org.springframework.cloud.stream.app</groupId>
-  <artifactId>spring-cloud-stream-app-starters</artifactId>
-  <version>1.0.0.BUILD-SNAPSHOT</version>
-  <packaging>pom</packaging>
+	<groupId>org.springframework.cloud.stream.app</groupId>
+	<artifactId>spring-cloud-stream-app-starters</artifactId>
+	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-stream</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
@@ -27,151 +32,162 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-xml</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-stream-test-support</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-test</artifactId>
+		</dependency>
+
 	</dependencies>
 
-  <properties>
-    <scs-app-maven-plugin.version>1.0.0.BUILD-SNAPSHOT</scs-app-maven-plugin.version>
-    <java.version>1.7</java.version>
-    <spring-cloud-stream.version>1.0.0.RC3</spring-cloud-stream.version>
-    <spring-integration.version>4.2.5.RELEASE</spring-integration.version>
-    <spring-integration-java-dsl.version>1.1.2.RELEASE</spring-integration-java-dsl.version>
-  </properties>
+	<properties>
+		<scs-app-maven-plugin.version>1.0.0.BUILD-SNAPSHOT</scs-app-maven-plugin.version>
+	</properties>
 
-  <modules>
-    <module>spring-cloud-stream-app-dependencies</module>
-    <module>spring-cloud-stream-app-generator</module>
-    <module>spring-cloud-stream-app-starters-docs</module>
-    <module>spring-cloud-stream-app-descriptor</module>
-    <module>app-starters-common</module>
-    <module>app-starters-common-analytics</module>
-    <module>app-starters-test-support</module>
-    <module>cassandra</module>
-    <module>cloudfoundry</module>
-    <module>file</module>
-    <module>ftp</module>
-    <module>gemfire</module>
-    <module>gpfdist</module>
-    <module>hdfs</module>
-    <module>http</module>
-    <module>jdbc</module>
-    <module>jms</module>
-    <module>log</module>
-    <module>metrics</module>
-    <module>processor</module>
-    <module>rabbit</module>
-    <module>redis</module>
-    <module>router</module>
-    <module>sftp</module>
-    <module>syslog</module>
-    <module>tcp</module>
-    <module>testing</module>
-    <module>time</module>
-    <module>trigger</module>
-    <module>twitter</module>
-    <module>websocket</module>
-  </modules>
+	<modules>
+		<module>spring-cloud-stream-app-dependencies</module>
+		<module>spring-cloud-stream-app-generator</module>
+		<module>spring-cloud-stream-app-starters-docs</module>
+		<module>spring-cloud-stream-app-descriptor</module>
+		<module>app-starters-common</module>
+		<module>app-starters-common-analytics</module>
+		<module>app-starters-test-support</module>
+		<module>cassandra</module>
+		<module>cloudfoundry</module>
+		<module>file</module>
+		<module>ftp</module>
+		<module>gemfire</module>
+		<module>gpfdist</module>
+		<module>hdfs</module>
+		<module>http</module>
+		<module>jdbc</module>
+		<module>jms</module>
+		<module>log</module>
+		<module>metrics</module>
+		<module>processor</module>
+		<module>rabbit</module>
+		<module>redis</module>
+		<module>router</module>
+		<module>sftp</module>
+		<module>syslog</module>
+		<module>tcp</module>
+		<module>testing</module>
+		<module>time</module>
+		<module>trigger</module>
+		<module>twitter</module>
+		<module>websocket</module>
+	</modules>
 
-  <scm>
-    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-stream-app-starters.git</connection>
-    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-stream-app-starters.git</developerConnection>
-    <url>https://github.com/spring-cloud/spring-cloud-stream-app-starters</url>
-  </scm>
+	<scm>
+		<connection>scm:git:git://github.com/spring-cloud/spring-cloud-stream-app-starters.git</connection>
+		<developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-stream-app-starters.git
+		</developerConnection>
+		<url>https://github.com/spring-cloud/spring-cloud-stream-app-starters</url>
+	</scm>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>spring-cloud-stream-app-dependencies</artifactId>
-        <version>1.0.0.BUILD-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud.stream.app</groupId>
+				<artifactId>spring-cloud-stream-app-dependencies</artifactId>
+				<version>1.0.0.BUILD-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <configuration>
-            <quiet>true</quiet>
-          </configuration>
-        </plugin>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <redirectTestOutputToFile>true</redirectTestOutputToFile>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<configuration>
+						<quiet>true</quiet>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<configuration>
+						<redirectTestOutputToFile>true</redirectTestOutputToFile>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 
-  <profiles>
-    <profile>
-      <id>spring</id>
-      <repositories>
-        <repository>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-          <id>spring-snapshots</id>
-          <name>Spring Snapshots</name>
-          <url>http://repo.spring.io/libs-snapshot-local</url>
-        </repository>
-        <repository>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <id>spring-milestones</id>
-          <name>Spring Milestones</name>
-          <url>http://repo.spring.io/libs-milestone-local</url>
-        </repository>
-        <repository>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <id>spring-releases</id>
-          <name>Spring Releases</name>
-          <url>http://repo.spring.io/release</url>
-        </repository>
-        <repository>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <id>spring-libs-release</id>
-          <name>Spring Libs Release</name>
-          <url>http://repo.spring.io/libs-release</url>
-        </repository>
-        <repository>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <id>spring-milestone-release</id>
-          <name>Spring Milestone Release</name>
-          <url>http://repo.spring.io/libs-milestone</url>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-          <id>spring-snapshots</id>
-          <name>Spring Snapshots</name>
-          <url>http://repo.spring.io/libs-snapshot-local</url>
-        </pluginRepository>
-        <pluginRepository>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <id>spring-milestones</id>
-          <name>Spring Milestones</name>
-          <url>http://repo.spring.io/libs-milestone-local</url>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
+	<profiles>
+		<profile>
+			<id>spring</id>
+			<repositories>
+				<repository>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>http://repo.spring.io/libs-snapshot-local</url>
+				</repository>
+				<repository>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>http://repo.spring.io/libs-milestone-local</url>
+				</repository>
+				<repository>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+					<id>spring-releases</id>
+					<name>Spring Releases</name>
+					<url>http://repo.spring.io/release</url>
+				</repository>
+				<repository>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+					<id>spring-libs-release</id>
+					<name>Spring Libs Release</name>
+					<url>http://repo.spring.io/libs-release</url>
+				</repository>
+				<repository>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+					<id>spring-milestone-release</id>
+					<name>Spring Milestone Release</name>
+					<url>http://repo.spring.io/libs-milestone</url>
+				</repository>
+			</repositories>
+			<pluginRepositories>
+				<pluginRepository>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>http://repo.spring.io/libs-snapshot-local</url>
+				</pluginRepository>
+				<pluginRepository>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>http://repo.spring.io/libs-milestone-local</url>
+				</pluginRepository>
+			</pluginRepositories>
+		</profile>
+	</profiles>
 
 </project>
diff --git a/processor/spring-cloud-starter-stream-processor-bridge/pom.xml b/processor/spring-cloud-starter-stream-processor-bridge/pom.xml
index 0412c349a..e67c8d366 100644
--- a/processor/spring-cloud-starter-stream-processor-bridge/pom.xml
+++ b/processor/spring-cloud-starter-stream-processor-bridge/pom.xml
@@ -13,21 +13,4 @@
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
-	</dependencies>
 </project>
diff --git a/processor/spring-cloud-starter-stream-processor-filter/pom.xml b/processor/spring-cloud-starter-stream-processor-filter/pom.xml
index 9428bdbed..5966004a3 100644
--- a/processor/spring-cloud-starter-stream-processor-filter/pom.xml
+++ b/processor/spring-cloud-starter-stream-processor-filter/pom.xml
@@ -13,21 +13,4 @@
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
-	</dependencies>
 </project>
diff --git a/processor/spring-cloud-starter-stream-processor-groovy-filter/pom.xml b/processor/spring-cloud-starter-stream-processor-groovy-filter/pom.xml
index 831ec1d31..d9e28c84c 100644
--- a/processor/spring-cloud-starter-stream-processor-groovy-filter/pom.xml
+++ b/processor/spring-cloud-starter-stream-processor-groovy-filter/pom.xml
@@ -18,25 +18,9 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-groovy</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-script-common</artifactId>
 		</dependency>
-
 	</dependencies>
 </project>
diff --git a/processor/spring-cloud-starter-stream-processor-groovy-transform/pom.xml b/processor/spring-cloud-starter-stream-processor-groovy-transform/pom.xml
index 41e4ea9eb..af933ebb5 100644
--- a/processor/spring-cloud-starter-stream-processor-groovy-transform/pom.xml
+++ b/processor/spring-cloud-starter-stream-processor-groovy-transform/pom.xml
@@ -18,25 +18,9 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-groovy</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-script-common</artifactId>
 		</dependency>
-
 	</dependencies>
 </project>
diff --git a/processor/spring-cloud-starter-stream-processor-httpclient/pom.xml b/processor/spring-cloud-starter-stream-processor-httpclient/pom.xml
index 5e75050a6..dc5355c18 100644
--- a/processor/spring-cloud-starter-stream-processor-httpclient/pom.xml
+++ b/processor/spring-cloud-starter-stream-processor-httpclient/pom.xml
@@ -18,22 +18,6 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-http</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-event</artifactId>
diff --git a/processor/spring-cloud-starter-stream-processor-pmml/pom.xml b/processor/spring-cloud-starter-stream-processor-pmml/pom.xml
index e235353c4..b373a0e6d 100644
--- a/processor/spring-cloud-starter-stream-processor-pmml/pom.xml
+++ b/processor/spring-cloud-starter-stream-processor-pmml/pom.xml
@@ -14,30 +14,13 @@
 	</parent>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud.stream.app</groupId>
-			<artifactId>app-starters-test-support</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.jpmml</groupId>
 			<artifactId>pmml-evaluator</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
 		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
+			<groupId>org.springframework.cloud.stream.app</groupId>
+			<artifactId>app-starters-test-support</artifactId>
 		</dependency>
-
 	</dependencies>
 </project>
diff --git a/processor/spring-cloud-starter-stream-processor-scriptable-transform/pom.xml b/processor/spring-cloud-starter-stream-processor-scriptable-transform/pom.xml
index 38f6522fc..2f2f4572c 100644
--- a/processor/spring-cloud-starter-stream-processor-scriptable-transform/pom.xml
+++ b/processor/spring-cloud-starter-stream-processor-scriptable-transform/pom.xml
@@ -18,36 +18,17 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-groovy</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.jruby</groupId>
 			<artifactId>jruby-complete</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.python</groupId>
 			<artifactId>jython-standalone</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-script-common</artifactId>
 		</dependency>
-
 	</dependencies>
 </project>
diff --git a/processor/spring-cloud-starter-stream-processor-splitter/pom.xml b/processor/spring-cloud-starter-stream-processor-splitter/pom.xml
index acb3dd84f..3029b9af7 100644
--- a/processor/spring-cloud-starter-stream-processor-splitter/pom.xml
+++ b/processor/spring-cloud-starter-stream-processor-splitter/pom.xml
@@ -18,21 +18,5 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-file</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
 	</dependencies>
 </project>
diff --git a/processor/spring-cloud-starter-stream-processor-transform/pom.xml b/processor/spring-cloud-starter-stream-processor-transform/pom.xml
index 03bb7c1d1..363ed46bf 100644
--- a/processor/spring-cloud-starter-stream-processor-transform/pom.xml
+++ b/processor/spring-cloud-starter-stream-processor-transform/pom.xml
@@ -13,21 +13,4 @@
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
-	</dependencies>
 </project>
diff --git a/rabbit/spring-cloud-starter-stream-sink-rabbit/pom.xml b/rabbit/spring-cloud-starter-stream-sink-rabbit/pom.xml
index 894d68ef6..e65adfcd5 100644
--- a/rabbit/spring-cloud-starter-stream-sink-rabbit/pom.xml
+++ b/rabbit/spring-cloud-starter-stream-sink-rabbit/pom.xml
@@ -18,25 +18,5 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-amqp</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
 	</dependencies>
 </project>
diff --git a/rabbit/spring-cloud-starter-stream-source-rabbit/pom.xml b/rabbit/spring-cloud-starter-stream-source-rabbit/pom.xml
index 896afcbfc..3be322e1e 100644
--- a/rabbit/spring-cloud-starter-stream-source-rabbit/pom.xml
+++ b/rabbit/spring-cloud-starter-stream-source-rabbit/pom.xml
@@ -22,24 +22,5 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-java-dsl</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/redis/spring-cloud-starter-stream-sink-redis/pom.xml b/redis/spring-cloud-starter-stream-sink-redis/pom.xml
index 2ae77bc44..89afff447 100644
--- a/redis/spring-cloud-starter-stream-sink-redis/pom.xml
+++ b/redis/spring-cloud-starter-stream-sink-redis/pom.xml
@@ -15,21 +15,9 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-redis</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-redis</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/router/spring-cloud-starter-stream-sink-router/pom.xml b/router/spring-cloud-starter-stream-sink-router/pom.xml
index c93c1046f..72e796d99 100644
--- a/router/spring-cloud-starter-stream-sink-router/pom.xml
+++ b/router/spring-cloud-starter-stream-sink-router/pom.xml
@@ -18,22 +18,6 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-groovy</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-script-common</artifactId>
diff --git a/sftp/spring-cloud-starter-stream-sink-sftp/pom.xml b/sftp/spring-cloud-starter-stream-sink-sftp/pom.xml
index 74189e30f..d202db639 100644
--- a/sftp/spring-cloud-starter-stream-sink-sftp/pom.xml
+++ b/sftp/spring-cloud-starter-stream-sink-sftp/pom.xml
@@ -18,41 +18,17 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-sftp</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-sftp-common</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-test-support</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.sshd</groupId>
 			<artifactId>sshd-core</artifactId>
 		</dependency>
-
 	</dependencies>
 </project>
diff --git a/sftp/spring-cloud-starter-stream-source-sftp/pom.xml b/sftp/spring-cloud-starter-stream-source-sftp/pom.xml
index 19af1d1d8..1d0b237ae 100644
--- a/sftp/spring-cloud-starter-stream-source-sftp/pom.xml
+++ b/sftp/spring-cloud-starter-stream-source-sftp/pom.xml
@@ -18,50 +18,25 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-sftp</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-java-dsl</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-sftp-common</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-test-support</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.sshd</groupId>
 			<artifactId>sshd-core</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-trigger-common</artifactId>
 		</dependency>
-
 	</dependencies>
 </project>
diff --git a/spring-cloud-stream-app-dependencies/pom.xml b/spring-cloud-stream-app-dependencies/pom.xml
index 8b16a4f4a..bb87cd69e 100644
--- a/spring-cloud-stream-app-dependencies/pom.xml
+++ b/spring-cloud-stream-app-dependencies/pom.xml
@@ -18,12 +18,15 @@
 
 	<properties>
 		<java.version>1.7</java.version>
+
 		<spring-cloud-stream.version>1.0.0.RC3</spring-cloud-stream.version>
-		<spring-integration.version>4.2.5.RELEASE</spring-integration.version>
 		<spring-data-hadoop.version>2.4.0.M1</spring-data-hadoop.version>
 		<cloudfoundry-client-lib.version>1.1.3</cloudfoundry-client-lib.version>
 
-		<reactor.version>2.0.5.RELEASE</reactor.version>
+		<spring-integration.version>4.2.5.RELEASE</spring-integration.version>
+		<spring-integration-java-dsl.version>1.1.2.RELEASE</spring-integration-java-dsl.version>
+
+		<reactor.version>2.0.8.RELEASE</reactor.version>
 		<codahale.version>3.0.2</codahale.version>
 		<netty.version>4.0.27.Final</netty.version>
 		<postgresql.version>9.4-1201-jdbc41</postgresql.version>
@@ -426,7 +429,7 @@
 			<dependency>
 				<groupId>org.springframework.integration</groupId>
 				<artifactId>spring-integration-java-dsl</artifactId>
-				<version>1.1.2.RELEASE</version>
+				<version>${spring-integration-java-dsl.version}</version>
 			</dependency>
 
 			<dependency>
diff --git a/syslog/spring-cloud-starter-stream-source-syslog/pom.xml b/syslog/spring-cloud-starter-stream-source-syslog/pom.xml
index 966378b42..26941161b 100644
--- a/syslog/spring-cloud-starter-stream-source-syslog/pom.xml
+++ b/syslog/spring-cloud-starter-stream-source-syslog/pom.xml
@@ -18,21 +18,9 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-syslog</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-test-support</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
 	</dependencies>
 </project>
diff --git a/tcp/spring-cloud-starter-stream-sink-tcp/pom.xml b/tcp/spring-cloud-starter-stream-sink-tcp/pom.xml
index 9e7ad80db..597f1081a 100644
--- a/tcp/spring-cloud-starter-stream-sink-tcp/pom.xml
+++ b/tcp/spring-cloud-starter-stream-sink-tcp/pom.xml
@@ -18,31 +18,13 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-ip</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-tcp-common</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-test-support</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
 	</dependencies>
 </project>
diff --git a/tcp/spring-cloud-starter-stream-source-tcp/pom.xml b/tcp/spring-cloud-starter-stream-source-tcp/pom.xml
index 1cd0257f4..7ed232a44 100644
--- a/tcp/spring-cloud-starter-stream-source-tcp/pom.xml
+++ b/tcp/spring-cloud-starter-stream-source-tcp/pom.xml
@@ -18,36 +18,13 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-ip</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-java-dsl</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-tcp-common</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-test-support</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
 	</dependencies>
 </project>
diff --git a/testing/spring-cloud-starter-stream-processor-integration-test/pom.xml b/testing/spring-cloud-starter-stream-processor-integration-test/pom.xml
index 0f1be75cb..f448eba20 100644
--- a/testing/spring-cloud-starter-stream-processor-integration-test/pom.xml
+++ b/testing/spring-cloud-starter-stream-processor-integration-test/pom.xml
@@ -13,21 +13,4 @@
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
-	</dependencies>
 </project>
diff --git a/testing/spring-cloud-starter-stream-sink-throughput/pom.xml b/testing/spring-cloud-starter-stream-sink-throughput/pom.xml
index 92a77e834..4f072494e 100644
--- a/testing/spring-cloud-starter-stream-sink-throughput/pom.xml
+++ b/testing/spring-cloud-starter-stream-sink-throughput/pom.xml
@@ -18,26 +18,5 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-amqp</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
 	</dependencies>
 </project>
diff --git a/testing/spring-cloud-starter-stream-source-load-generator/pom.xml b/testing/spring-cloud-starter-stream-source-load-generator/pom.xml
index ccc5d1b9d..350d11b64 100644
--- a/testing/spring-cloud-starter-stream-source-load-generator/pom.xml
+++ b/testing/spring-cloud-starter-stream-source-load-generator/pom.xml
@@ -22,30 +22,9 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-java-dsl</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-test-support</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/time/spring-cloud-starter-stream-source-time/pom.xml b/time/spring-cloud-starter-stream-source-time/pom.xml
index 7124b9786..bf7c704db 100644
--- a/time/spring-cloud-starter-stream-source-time/pom.xml
+++ b/time/spring-cloud-starter-stream-source-time/pom.xml
@@ -18,11 +18,6 @@
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-time-common</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-trigger-common</artifactId>
diff --git a/trigger/spring-cloud-starter-stream-source-trigger/pom.xml b/trigger/spring-cloud-starter-stream-source-trigger/pom.xml
index 2ff914d8e..30b69edaa 100644
--- a/trigger/spring-cloud-starter-stream-source-trigger/pom.xml
+++ b/trigger/spring-cloud-starter-stream-source-trigger/pom.xml
@@ -18,10 +18,6 @@
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-trigger-common</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-annotation-common</artifactId>
diff --git a/twitter/spring-cloud-starter-stream-source-twitterstream/pom.xml b/twitter/spring-cloud-starter-stream-source-twitterstream/pom.xml
index ab30b1d42..5fa0eab7d 100644
--- a/twitter/spring-cloud-starter-stream-source-twitterstream/pom.xml
+++ b/twitter/spring-cloud-starter-stream-source-twitterstream/pom.xml
@@ -18,15 +18,9 @@
 			<groupId>org.springframework.cloud.stream.app</groupId>
 			<artifactId>app-starters-twitter-common</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-twitter</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/websocket/spring-cloud-starter-stream-sink-websocket/pom.xml b/websocket/spring-cloud-starter-stream-sink-websocket/pom.xml
index 755c453b8..89765d8c1 100644
--- a/websocket/spring-cloud-starter-stream-sink-websocket/pom.xml
+++ b/websocket/spring-cloud-starter-stream-sink-websocket/pom.xml
@@ -18,36 +18,9 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-websocket</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-core</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-all</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-test</artifactId>
-		</dependency>
-
 	</dependencies>
 </project>