Merge branch '2.0.x'

2018-05-31 13:42:23 +01:00
parent 55d70d5691 0d7d95d8a9
commit cff5c1ec72
1 changed files with 0 additions and 2 deletions
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
@@ -72,8 +72,6 @@ public class RestTemplateBuilder {
 				"org.springframework.http.client.HttpComponentsClientHttpRequestFactory");
 		candidates.put("okhttp3.OkHttpClient",
 				"org.springframework.http.client.OkHttp3ClientHttpRequestFactory");
-		candidates.put("com.squareup.okhttp.OkHttpClient",
-				"org.springframework.http.client.OkHttpClientHttpRequestFactory");
 		REQUEST_FACTORY_CANDIDATES = Collections.unmodifiableMap(candidates);
 	}