Merge branch '2.1.x'

# Conflicts: # spring-cloud-openfeign-core/pom.xml
5 years ago · 39dfa0ef7f
1 changed files with 0 additions and 6 deletions
--- a/spring-cloud-openfeign-core/pom.xml
+++ b/spring-cloud-openfeign-core/pom.xml
@ -163,12 +163,6 @@
				@@ -163,12 +163,6 @@
 			<artifactId>rxjava</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey.contribs</groupId>
-			<artifactId>jersey-apache-client4</artifactId>
-			<version>${jersey-apache-client4.version}</version>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>