From 6520992b316fdc1964df3ff3c50a12aaf8c4b1cf Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Thu, 21 Sep 2017 14:00:10 +0100
Subject: [PATCH] Manage dependency for aws sdk

---
 pom.xml                            | 65 ++++++++++++++++--------------
 spring-cloud-config-server/pom.xml |  1 -
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index 94ff24fd..aca4a35f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,38 +25,43 @@
 		<spring-cloud-commons.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
     </properties>
 	<modules>
-	  <module>spring-cloud-config-dependencies</module>
-	  <module>spring-cloud-config-client</module>
-	  <module>spring-cloud-config-server</module>
-	  <module>spring-cloud-config-monitor</module>
-	  <module>spring-cloud-config-sample</module>
-	  <module>spring-cloud-starter-config</module>
-	  <module>docs</module>
+		<module>spring-cloud-config-dependencies</module>
+		<module>spring-cloud-config-client</module>
+		<module>spring-cloud-config-server</module>
+		<module>spring-cloud-config-monitor</module>
+		<module>spring-cloud-config-sample</module>
+		<module>spring-cloud-starter-config</module>
+		<module>docs</module>
 	</modules>
     <dependencyManagement>
-      <dependencies>
-		<dependency>
-		  <groupId>org.springframework.cloud</groupId>
-		  <artifactId>spring-cloud-config-dependencies</artifactId>
-		  <version>${project.version}</version>
-		  <type>pom</type>
-		  <scope>import</scope>
-		</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-commons</artifactId>
-		  <type>test-jar</type>
-		  <scope>test</scope>
-		  <version>${spring-cloud-commons.version}</version>
-		</dependency>
-     </dependencies>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-config-dependencies</artifactId>
+				<version>${project.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</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-commons</artifactId>
+				<type>test-jar</type>
+				<scope>test</scope>
+				<version>${spring-cloud-commons.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.amazonaws</groupId>
+				<artifactId>aws-java-sdk-core</artifactId>
+				<version>1.11.52</version>
+			</dependency>
+		</dependencies>
     </dependencyManagement>
 	<profiles>
 		<profile>
diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml
index 21237c68..4fa6c4c8 100644
--- a/spring-cloud-config-server/pom.xml
+++ b/spring-cloud-config-server/pom.xml
@@ -58,7 +58,6 @@
 		<dependency>
 			<groupId>com.amazonaws</groupId>
 			<artifactId>aws-java-sdk-core</artifactId>
-			<version>1.11.52</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>