From 4c84524b485badc38ab80367e80201f3a6579d03 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Tue, 28 Feb 2017 21:23:29 +0100
Subject: [PATCH] Import spring-cloud-commons-dependencies BOM in parent pom.

Use dependency management from spring-cloud-commons-dependencies for Spring Cloud Commons instead own dependency management declaration to avoid version conflicts.

See gh-82.
---
 pom.xml                                 | 11 ++++++++++-
 spring-cloud-vault-dependencies/pom.xml |  8 --------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 313370ff..c73c1c2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
 		<version>1.3.0.M1</version>
-		<relativePath />
+		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
 
@@ -38,6 +38,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring-cloud-commons.version>1.2.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
 	</properties>
 
 	<dependencyManagement>
@@ -50,6 +51,14 @@
 				<type>pom</type>
 			</dependency>
 
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-commons-dependencies</artifactId>
+				<version>${spring-cloud-commons.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-vault-config</artifactId>
diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml
index 480619ee..08df53b4 100644
--- a/spring-cloud-vault-dependencies/pom.xml
+++ b/spring-cloud-vault-dependencies/pom.xml
@@ -18,7 +18,6 @@
 	<description>Spring Cloud Vault Dependencies</description>
 
 	<properties>
-		<spring-cloud-context.version>1.2.0.M1</spring-cloud-context.version>
 		<spring-vault.version>1.0.0.BUILD-SNAPSHOT</spring-vault.version>
 		<httpclient.version>4.5.2</httpclient.version>
 		<httpcore.version>4.4.5</httpcore.version>
@@ -90,13 +89,6 @@
 				<version>${project.version}</version>
 			</dependency>
 
-			<!-- Spring Cloud Commons -->
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-context</artifactId>
-				<version>${spring-cloud-context.version}</version>
-			</dependency>
-
 			<!-- HTTP Client Libraries -->
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>