From 68ea49d0826c2528728c53d7b5a70658571a97c8 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Thu, 26 Apr 2018 12:36:35 -0400
Subject: [PATCH] Make Apache HTTP Client optional. (#360)

---
 spring-cloud-commons/pom.xml                                    | 1 +
 .../cloud/commons/httpclient/HttpClientConfiguration.java       | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml
index cf52eb20..5b2ef897 100644
--- a/spring-cloud-commons/pom.xml
+++ b/spring-cloud-commons/pom.xml
@@ -145,6 +145,7 @@
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
 			<version>${apachehttpclient.version}</version>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java
index 1ab488fb..3160203d 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java
@@ -2,6 +2,7 @@ package org.springframework.cloud.commons.httpclient;
 
 import okhttp3.OkHttpClient;
 
+import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -17,6 +18,7 @@ public class HttpClientConfiguration {
 
 	@Configuration
 	@ConditionalOnProperty(name = "spring.cloud.httpclientfactories.apache.enabled", matchIfMissing = true)
+	@ConditionalOnClass(HttpClient.class)
 	static class ApacheHttpClientConfiguration {
 
 		@Bean