From 8198730b8f8bccbd0cd0798c8780a7229fb4a96a Mon Sep 17 00:00:00 2001
From: tfabien <ftaysse@gmail.com>
Date: Tue, 16 Mar 2021 18:40:39 +0100
Subject: [PATCH] Use feign dependencies for okhttp/httpclient

Use `io.github.openfeign:feign-okhttp` and `io.github.openfeign:feign-httpclient instead` of `com.squareup.okhttp3:okhttp` and `org.apache.httpcomponents:httpclient`
If not, Feign client won't use these clients and won't honor the `feign.okhttp.enabled` / `feign.httpclient.enabled` configuration (and fallback to sun httpClient, without using the proxy selector)
---
 httpclient-spring-boot-sample/pom.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/httpclient-spring-boot-sample/pom.xml b/httpclient-spring-boot-sample/pom.xml
index 21589bd..ffcd42b 100644
--- a/httpclient-spring-boot-sample/pom.xml
+++ b/httpclient-spring-boot-sample/pom.xml
@@ -28,23 +28,24 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
+    
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter-openfeign</artifactId>
     </dependency>
+     <!-- Add both clients to support this showcase -->
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
+      <groupId>io.github.openfeign</groupId>
+      <artifactId>feign-okhttp</artifactId>
     </dependency>
-
-    <!-- Add both clients to support this showcase -->
     <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
+      <groupId>io.github.openfeign</groupId>
+      <artifactId>feign-httpclient</artifactId>
     </dependency>
+    
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
     </dependency>
 
   </dependencies>