Merge branch '2.1.x'

# Conflicts:
#	spring-cloud-openfeign-core/pom.xml
This commit is contained in:
Olga Maciaszek-Sharma
2019-08-30 16:57:50 +02:00

View File

@@ -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>