From 1c427fab302a10eff5c6d66c8f128129bf3fa4fb Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Mon, 25 Jan 2016 15:20:17 +0000
Subject: [PATCH] Extract all dependencies to BOMs and upgrade Boot

---
 pom.xml                               | 27 ++++---------------
 spring-cloud-bus-dependencies/pom.xml | 38 +--------------------------
 2 files changed, 6 insertions(+), 59 deletions(-)

diff --git a/pom.xml b/pom.xml
index e9e709a..76bea72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,6 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-cloud-bus-parent</artifactId>
+    <version>1.0.3.BUILD-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>spring-cloud-bus-parent</name>
@@ -12,7 +13,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-build</artifactId>
-        <version>1.0.3.BUILD-SNAPSHOT</version>
+        <version>1.0.4.BUILD-SNAPSHOT</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -23,9 +24,8 @@
 
     <properties>
         <bintray.package>bus</bintray.package>
-        <spring-cloud-config.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-config.version>
-        <spring-cloud-netflix.version>1.0.4.BUILD-SNAPSHOT</spring-cloud-netflix.version>
         <spring-integration.version>4.1.0.RELEASE</spring-integration.version>
+        <spring-cloud-bus.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-bus.version>
         <spring-cloud-connector.version>1.1.0.RELEASE</spring-cloud-connector.version>
         <spring-integration-dsl.version>1.0.1.RELEASE</spring-integration-dsl.version>
         <turbine.version>2.0.0-DP.2</turbine.version>
@@ -36,28 +36,11 @@
         <dependencies>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-config</artifactId>
-				<version>${spring-cloud-config.version}</version>
+				<artifactId>spring-cloud-bus-dependencies</artifactId>
+				<version>${spring-cloud-bus.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix</artifactId>
-				<version>${spring-cloud-netflix.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-bus-amqp</artifactId>
-				<version>1.0.4.BUILD-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-bus</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
-			</dependency>
 		    <dependency>
 			  <groupId>org.springframework</groupId>
 			  <artifactId>spring-context</artifactId>
diff --git a/spring-cloud-bus-dependencies/pom.xml b/spring-cloud-bus-dependencies/pom.xml
index 0cb87b7..e90d110 100644
--- a/spring-cloud-bus-dependencies/pom.xml
+++ b/spring-cloud-bus-dependencies/pom.xml
@@ -52,44 +52,8 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-bus</artifactId>
-				<version>1.0.3.BUILD-SNAPSHOT</version>
+				<version>1.0.4.BUILD-SNAPSHOT</version>
 			</dependency>
-            <dependency>
-                <groupId>org.springframework.integration</groupId>
-                <artifactId>spring-integration-java-dsl</artifactId>
-                <version>${spring-integration-dsl.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.integration</groupId>
-                <artifactId>spring-integration-amqp</artifactId>
-                <version>${spring-integration.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.integration</groupId>
-                <artifactId>spring-integration-event</artifactId>
-                <version>${spring-integration.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-spring-service-connector</artifactId>
-                <version>${spring-cloud-connector.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>log4j</artifactId>
-                        <groupId>log4j</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-localconfig-connector</artifactId>
-                <version>${spring-cloud-connector.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-cloudfoundry-connector</artifactId>
-                <version>${spring-cloud-connector.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>