Commit 481e3122 by Ryan Baxter

Merge remote-tracking branch 'origin/1.3.x'

parents 8fb89b25 040ce4db
......@@ -70,6 +70,7 @@ public class OkHttpRibbonResponseTests {
return new Response.Builder()
.request(new Request.Builder().url(HttpUrl.get(uri)).build())
.protocol(Protocol.HTTP_1_1)
.code(HttpStatus.OK.value());
.code(HttpStatus.OK.value())
.message(HttpStatus.OK.getReasonPhrase());
}
}
......@@ -26,7 +26,7 @@
<turbine.version>1.0.0</turbine.version>
<eureka-jersey.version>1.19.1</eureka-jersey.version>
<xstream.version>1.4.9</xstream.version>
<okhttp3.version>3.6.0</okhttp3.version>
<okhttp3.version>3.8.1</okhttp3.version>
</properties>
<dependencyManagement>
<dependencies>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment