From 63ac877d13fb792188fcf8c01be32e22c7fb7ec8 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Thu, 2 Mar 2017 09:26:51 +0100
Subject: [PATCH] Move HTTP client dependency management to parent pom.

Remove dependency management of HTTP clients from dependency BOM to not conflict with declarations of Spring Boot or other BOMs.

Closes gh-82.
---
 pom.xml                                 | 47 +++++++++++++++++++++++-
 spring-cloud-vault-dependencies/pom.xml | 48 -------------------------
 2 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/pom.xml b/pom.xml
index c73c1c2d..eaecb9d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,7 @@
 <?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>
 
 	<parent>
@@ -39,6 +41,11 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring-cloud-commons.version>1.2.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
+		<httpclient.version>4.5.2</httpclient.version>
+		<httpcore.version>4.4.5</httpcore.version>
+		<netty.version>4.1.6.Final</netty.version>
+		<okhttp.version>2.7.5</okhttp.version>
+		<okhttp3.version>3.5.0</okhttp3.version>
 	</properties>
 
 	<dependencyManagement>
@@ -66,6 +73,44 @@
 				<type>test-jar</type>
 				<scope>test</scope>
 			</dependency>
+
+			<!-- HTTP Client Libraries -->
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpclient</artifactId>
+				<version>${httpclient.version}</version>
+				<optional>true</optional>
+				<exclusions>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpcore</artifactId>
+				<version>${httpcore.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>${netty.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>com.squareup.okhttp</groupId>
+				<artifactId>okhttp</artifactId>
+				<version>${okhttp.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>com.squareup.okhttp3</groupId>
+				<artifactId>okhttp</artifactId>
+				<version>${okhttp3.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml
index 08df53b4..868d85e2 100644
--- a/spring-cloud-vault-dependencies/pom.xml
+++ b/spring-cloud-vault-dependencies/pom.xml
@@ -19,11 +19,6 @@
 
 	<properties>
 		<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>
-		<netty.version>4.1.6.Final</netty.version>
-		<okhttp.version>2.7.5</okhttp.version>
-		<okhttp3.version>3.5.0</okhttp3.version>
 	</properties>
 
 	<dependencyManagement>
@@ -88,49 +83,6 @@
 				<artifactId>spring-cloud-starter-vault-config</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-
-			<!-- HTTP Client Libraries -->
-			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpclient</artifactId>
-				<version>${httpclient.version}</version>
-				<optional>true</optional>
-				<exclusions>
-					<exclusion>
-						<groupId>commons-logging</groupId>
-						<artifactId>commons-logging</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpcore</artifactId>
-				<version>${httpcore.version}</version>
-				<optional>true</optional>
-			</dependency>
-
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-all</artifactId>
-				<version>${netty.version}</version>
-				<optional>true</optional>
-			</dependency>
-
-			<dependency>
-				<groupId>com.squareup.okhttp</groupId>
-				<artifactId>okhttp</artifactId>
-				<version>${okhttp.version}</version>
-				<optional>true</optional>
-			</dependency>
-
-			<dependency>
-				<groupId>com.squareup.okhttp3</groupId>
-				<artifactId>okhttp</artifactId>
-				<version>${okhttp3.version}</version>
-				<optional>true</optional>
-			</dependency>
-
 		</dependencies>
 	</dependencyManagement>