Bumps dependency versions for integrations

* OkHttp/MockWebServer 2.5.0
* Jackson 2.6.1
* Apache Http Client 4.5
* JMH 1.10.5

CHANGELOG.md

@@ -1,5 +1,10 @@
 ### Version 8.8
 * Adds jackson-jaxb codec
+* Bumps dependency versions for integrations
+ * OkHttp/MockWebServer 2.5.0
+ * Jackson 2.6.1
+ * Apache Http Client 4.5
+ * JMH 1.10.5
 
 ### Version 8.7
 * Bumps dependency versions for integrations

benchmark/pom.xml

@@ -16,7 +16,7 @@
   <name>Feign Benchmark (JMH)</name>
 
   <properties>
-    <jmh.version>1.10.3</jmh.version>
+    <jmh.version>1.10.5</jmh.version>
   </properties>
 
   <dependencies>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.squareup.okhttp</groupId>
       <artifactId>mockwebserver</artifactId>
-      <version>2.4.0</version>
+      <version>2.5.0</version>
       <exclusions>
         <exclusion>
           <groupId>org.bouncycastle</groupId>

core/build.gradle

@@ -5,6 +5,6 @@ sourceCompatibility = 1.6
 dependencies {
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
-    testCompile 'com.squareup.okhttp:mockwebserver:2.4.0'
+    testCompile 'com.squareup.okhttp:mockwebserver:2.5.0'
     testCompile 'com.google.code.gson:gson:2.3.1' // for example
 }

core/src/test/java/feign/BaseApiTest.java

@@ -18,7 +18,7 @@
 import com.google.gson.reflect.TypeToken;
 
 import com.squareup.okhttp.mockwebserver.MockResponse;
-import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -34,7 +34,7 @@
 public class BaseApiTest {
 
   @Rule
-  public final MockWebServerRule server = new MockWebServerRule();
+  public final MockWebServer server = new MockWebServer();
 
   interface BaseApi<K, M> {
 

core/src/test/java/feign/FeignBuilderTest.java

@@ -16,7 +16,7 @@
 package feign;
 
 import com.squareup.okhttp.mockwebserver.MockResponse;
-import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -38,7 +38,7 @@
 public class FeignBuilderTest {
 
   @Rule
-  public final MockWebServerRule server = new MockWebServerRule();
+  public final MockWebServer server = new MockWebServer();
 
   @Test
   public void testDefaults() throws Exception {

core/src/test/java/feign/FeignTest.java

@@ -20,7 +20,7 @@
 
 import com.squareup.okhttp.mockwebserver.MockResponse;
 import com.squareup.okhttp.mockwebserver.SocketPolicy;
-import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
 
 import okio.Buffer;
 import org.junit.Rule;
@@ -54,7 +54,7 @@ public class FeignTest {
   @Rule
   public final ExpectedException thrown = ExpectedException.none();
   @Rule
-  public final MockWebServerRule server = new MockWebServerRule();
+  public final MockWebServer server = new MockWebServer();
 
   @Test
   public void iterableQueryParams() throws Exception {

core/src/test/java/feign/LoggerTest.java

@@ -16,7 +16,7 @@
 package feign;
 
 import com.squareup.okhttp.mockwebserver.MockResponse;
-import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
 
 import org.assertj.core.api.SoftAssertions;
 import org.junit.Rule;
@@ -42,7 +42,7 @@
 public class LoggerTest {
 
   @Rule
-  public final MockWebServerRule server = new MockWebServerRule();
+  public final MockWebServer server = new MockWebServer();
   @Rule
   public final RecordingLogger logger = new RecordingLogger();
   @Rule

core/src/test/java/feign/TargetTest.java

@@ -16,7 +16,7 @@
 package feign;
 
 import com.squareup.okhttp.mockwebserver.MockResponse;
-import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -28,7 +28,7 @@
 public class TargetTest {
 
   @Rule
-  public final MockWebServerRule server = new MockWebServerRule();
+  public final MockWebServer server = new MockWebServer();
 
   interface TestQuery {
 

core/src/test/java/feign/client/DefaultClientTest.java

@@ -17,7 +17,7 @@
 
 import com.squareup.okhttp.mockwebserver.MockResponse;
 import com.squareup.okhttp.mockwebserver.SocketPolicy;
-import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -49,7 +49,7 @@ public class DefaultClientTest {
   @Rule
   public final ExpectedException thrown = ExpectedException.none();
   @Rule
-  public final MockWebServerRule server = new MockWebServerRule();
+  public final MockWebServer server = new MockWebServer();
   Client trustSSLSockets = new Client.Default(TrustingSSLSocketFactory.get(), null);
   Client disableHostnameVerification =
       new Client.Default(TrustingSSLSocketFactory.get(), new HostnameVerifier() {
@@ -116,7 +116,7 @@ public void patchUnsupported() throws IOException, InterruptedException {
 
   @Test
   public void canOverrideSSLSocketFactory() throws IOException, InterruptedException {
-    server.get().useHttps(TrustingSSLSocketFactory.get("localhost"), false);
+    server.useHttps(TrustingSSLSocketFactory.get("localhost"), false);
     server.enqueue(new MockResponse());
 
     TestInterface api = Feign.builder()
@@ -128,7 +128,7 @@ public void canOverrideSSLSocketFactory() throws IOException, InterruptedExcepti
 
   @Test
   public void canOverrideHostnameVerifier() throws IOException, InterruptedException {
-    server.get().useHttps(TrustingSSLSocketFactory.get("bad.example.com"), false);
+    server.useHttps(TrustingSSLSocketFactory.get("bad.example.com"), false);
     server.enqueue(new MockResponse());
 
     TestInterface api = Feign.builder()
@@ -140,7 +140,7 @@ public void canOverrideHostnameVerifier() throws IOException, InterruptedExcepti
 
   @Test
   public void retriesFailedHandshake() throws IOException, InterruptedException {
-    server.get().useHttps(TrustingSSLSocketFactory.get("localhost"), false);
+    server.useHttps(TrustingSSLSocketFactory.get("localhost"), false);
     server.enqueue(new MockResponse().setSocketPolicy(SocketPolicy.FAIL_HANDSHAKE));
     server.enqueue(new MockResponse());
 

httpclient/build.gradle

@@ -4,9 +4,9 @@ sourceCompatibility = 1.6
 
 dependencies {
     compile project(':feign-core')
-    compile 'org.apache.httpcomponents:httpclient:4.4.1'
+    compile 'org.apache.httpcomponents:httpclient:4.5'
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
-    testCompile 'com.squareup.okhttp:mockwebserver:2.4.0'
+    testCompile 'com.squareup.okhttp:mockwebserver:2.5.0'
     testCompile project(':feign-core').sourceSets.test.output // for assertions
 }

httpclient/src/test/java/feign/httpclient/ApacheHttpClientTest.java

@@ -16,7 +16,7 @@
 package feign.httpclient;
 
 import com.squareup.okhttp.mockwebserver.MockResponse;
-import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
 import feign.Feign;
 import feign.FeignException;
 import feign.Headers;
@@ -40,7 +40,7 @@ public class ApacheHttpClientTest {
   @Rule
   public final ExpectedException thrown = ExpectedException.none();
   @Rule
-  public final MockWebServerRule server = new MockWebServerRule();
+  public final MockWebServer server = new MockWebServer();
 
   @Test
   public void parsesRequestAndResponse() throws IOException, InterruptedException {

okhttp/build.gradle

@@ -4,9 +4,9 @@ sourceCompatibility = 1.6
 
 dependencies {
     compile project(':feign-core')
-    compile 'com.squareup.okhttp:okhttp:2.4.0'
+    compile 'com.squareup.okhttp:okhttp:2.5.0'
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
-    testCompile 'com.squareup.okhttp:mockwebserver:2.4.0'
+    testCompile 'com.squareup.okhttp:mockwebserver:2.5.0'
     testCompile project(':feign-core').sourceSets.test.output // for assertions
 }

okhttp/src/test/java/feign/okhttp/OkHttpClientTest.java

@@ -16,7 +16,7 @@
 package feign.okhttp;
 
 import com.squareup.okhttp.mockwebserver.MockResponse;
-import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
 
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -43,7 +43,7 @@ public class OkHttpClientTest {
   @Rule
   public final ExpectedException thrown = ExpectedException.none();
   @Rule
-  public final MockWebServerRule server = new MockWebServerRule();
+  public final MockWebServer server = new MockWebServer();
 
   @Test
   public void parsesRequestAndResponse() throws IOException, InterruptedException {

ribbon/build.gradle

@@ -7,6 +7,6 @@ dependencies {
     compile 'com.netflix.ribbon:ribbon-loadbalancer:2.1.0'
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
-    testCompile 'com.squareup.okhttp:mockwebserver:2.4.0'
+    testCompile 'com.squareup.okhttp:mockwebserver:2.5.0'
     testCompile project(':feign-core').sourceSets.test.output
 }

ribbon/src/test/java/feign/ribbon/LoadBalancingTargetTest.java

@@ -16,7 +16,7 @@
 package feign.ribbon;
 
 import com.squareup.okhttp.mockwebserver.MockResponse;
-import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -33,9 +33,9 @@
 public class LoadBalancingTargetTest {
 
   @Rule
-  public final MockWebServerRule server1 = new MockWebServerRule();
+  public final MockWebServer server1 = new MockWebServer();
   @Rule
-  public final MockWebServerRule server2 = new MockWebServerRule();
+  public final MockWebServer server2 = new MockWebServer();
 
   static String hostAndPort(URL url) {
     // our build slaves have underscores in their hostnames which aren't permitted by ribbon

ribbon/src/test/java/feign/ribbon/RibbonClientTest.java

@@ -33,7 +33,7 @@
 import com.netflix.client.config.IClientConfig;
 import com.squareup.okhttp.mockwebserver.MockResponse;
 import com.squareup.okhttp.mockwebserver.SocketPolicy;
-import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
 
 import feign.Client;
 import feign.Feign;
@@ -47,9 +47,9 @@ public class RibbonClientTest {
   @Rule
   public final TestName testName = new TestName();
   @Rule
-  public final MockWebServerRule server1 = new MockWebServerRule();
+  public final MockWebServer server1 = new MockWebServer();
   @Rule
-  public final MockWebServerRule server2 = new MockWebServerRule();
+  public final MockWebServer server2 = new MockWebServer();
 
   static String hostAndPort(URL url) {
     // our build slaves have underscores in their hostnames which aren't permitted by ribbon
@@ -132,7 +132,7 @@ public void testHTTPSViaRibbon() {
 
     Client trustSSLSockets = new Client.Default(TrustingSSLSocketFactory.get(), null);
 
-    server1.get().useHttps(TrustingSSLSocketFactory.get("localhost"), false);
+    server1.useHttps(TrustingSSLSocketFactory.get("localhost"), false);
     server1.enqueue(new MockResponse().setBody("success!"));
 
     getConfigInstance().setProperty(serverListKey(), hostAndPort(server1.getUrl("")));