From 4c5c4b90a0adf58c83c5202fbe27254746e34623 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Mon, 15 Aug 2016 10:42:27 +0100
Subject: [PATCH] Fix dependencies

Need to use "provided" scope for stuff that is not required in the
/ext classpath. Also need to use a proper BOM for stream
dependencies to avoid mouldy versions being imported.
---
 pom.xml                  | 11 ++---------
 spring-cloud-cli/pom.xml | 22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index e5d5a92..0821884 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,15 +95,8 @@
 		<dependencies>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-config</artifactId>
-				<version>1.1.3.BUILD-SNAPSHOT</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix</artifactId>
-				<version>1.1.4.BUILD-SNAPSHOT</version>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>Brixton.BUILD-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-cloud-cli/pom.xml b/spring-cloud-cli/pom.xml
index 1d7200e..65d4eb6 100644
--- a/spring-cloud-cli/pom.xml
+++ b/spring-cloud-cli/pom.xml
@@ -17,6 +17,10 @@
 		<version>1.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
+	<properties>
+		<spring-boot.version>1.4.1.BUILD-SNAPSHOT</spring-boot.version>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud.launcher</groupId>
@@ -24,19 +28,25 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-cli</artifactId>
-			<version>${spring-boot.version}</version>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-stream</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-rsa</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream</artifactId>
-			<optional>true</optional>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-cli</artifactId>
+			<version>${spring-boot.version}</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>