Skip to content

Commit b3a43ad

Browse files
Adrian ColeAdrian Cole
Adrian Cole
authored and
Adrian Cole
committed
Bumps dependency versions for integrations
* OkHttp/MockWebServer 2.5.0 * Jackson 2.6.1 * Apache Http Client 4.5 * JMH 1.10.5
1 parent 37d4441 commit b3a43ad

16 files changed

Lines changed: 39 additions & 34 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
### Version 8.8
22
* Adds jackson-jaxb codec
3+
* Bumps dependency versions for integrations
4+
* OkHttp/MockWebServer 2.5.0
5+
* Jackson 2.6.1
6+
* Apache Http Client 4.5
7+
* JMH 1.10.5
38

49
### Version 8.7
510
* Bumps dependency versions for integrations

‎benchmark/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<name>Feign Benchmark (JMH)</name>
1717

1818
<properties>
19-
<jmh.version>1.10.3</jmh.version>
19+
<jmh.version>1.10.5</jmh.version>
2020
</properties>
2121

2222
<dependencies>
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>com.squareup.okhttp</groupId>
3535
<artifactId>mockwebserver</artifactId>
36-
<version>2.4.0</version>
36+
<version>2.5.0</version>
3737
<exclusions>
3838
<exclusion>
3939
<groupId>org.bouncycastle</groupId>

‎core/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ sourceCompatibility = 1.6
55
dependencies {
66
testCompile 'junit:junit:4.12'
77
testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
8-
testCompile 'com.squareup.okhttp:mockwebserver:2.4.0'
8+
testCompile 'com.squareup.okhttp:mockwebserver:2.5.0'
99
testCompile 'com.google.code.gson:gson:2.3.1' // for example
1010
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import com.google.gson.reflect.TypeToken;
1919

2020
import com.squareup.okhttp.mockwebserver.MockResponse;
21-
import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
21+
import com.squareup.okhttp.mockwebserver.MockWebServer;
2222

2323
import org.junit.Rule;
2424
import org.junit.Test;
@@ -34,7 +34,7 @@
3434
public class BaseApiTest {
3535

3636
@Rule
37-
public final MockWebServerRule server = new MockWebServerRule();
37+
public final MockWebServer server = new MockWebServer();
3838

3939
interface BaseApi<K, M> {
4040

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package feign;
1717

1818
import com.squareup.okhttp.mockwebserver.MockResponse;
19-
import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
19+
import com.squareup.okhttp.mockwebserver.MockWebServer;
2020

2121
import org.junit.Rule;
2222
import org.junit.Test;
@@ -38,7 +38,7 @@
3838
public class FeignBuilderTest {
3939

4040
@Rule
41-
public final MockWebServerRule server = new MockWebServerRule();
41+
public final MockWebServer server = new MockWebServer();
4242

4343
@Test
4444
public void testDefaults() throws Exception {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import com.squareup.okhttp.mockwebserver.MockResponse;
2222
import com.squareup.okhttp.mockwebserver.SocketPolicy;
23-
import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
23+
import com.squareup.okhttp.mockwebserver.MockWebServer;
2424

2525
import okio.Buffer;
2626
import org.junit.Rule;
@@ -54,7 +54,7 @@ public class FeignTest {
5454
@Rule
5555
public final ExpectedException thrown = ExpectedException.none();
5656
@Rule
57-
public final MockWebServerRule server = new MockWebServerRule();
57+
public final MockWebServer server = new MockWebServer();
5858

5959
@Test
6060
public void iterableQueryParams() throws Exception {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package feign;
1717

1818
import com.squareup.okhttp.mockwebserver.MockResponse;
19-
import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
19+
import com.squareup.okhttp.mockwebserver.MockWebServer;
2020

2121
import org.assertj.core.api.SoftAssertions;
2222
import org.junit.Rule;
@@ -42,7 +42,7 @@
4242
public class LoggerTest {
4343

4444
@Rule
45-
public final MockWebServerRule server = new MockWebServerRule();
45+
public final MockWebServer server = new MockWebServer();
4646
@Rule
4747
public final RecordingLogger logger = new RecordingLogger();
4848
@Rule

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package feign;
1717

1818
import com.squareup.okhttp.mockwebserver.MockResponse;
19-
import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
19+
import com.squareup.okhttp.mockwebserver.MockWebServer;
2020

2121
import org.junit.Rule;
2222
import org.junit.Test;
@@ -28,7 +28,7 @@
2828
public class TargetTest {
2929

3030
@Rule
31-
public final MockWebServerRule server = new MockWebServerRule();
31+
public final MockWebServer server = new MockWebServer();
3232

3333
interface TestQuery {
3434

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import com.squareup.okhttp.mockwebserver.MockResponse;
1919
import com.squareup.okhttp.mockwebserver.SocketPolicy;
20-
import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
20+
import com.squareup.okhttp.mockwebserver.MockWebServer;
2121

2222
import org.junit.Rule;
2323
import org.junit.Test;
@@ -49,7 +49,7 @@ public class DefaultClientTest {
4949
@Rule
5050
public final ExpectedException thrown = ExpectedException.none();
5151
@Rule
52-
public final MockWebServerRule server = new MockWebServerRule();
52+
public final MockWebServer server = new MockWebServer();
5353
Client trustSSLSockets = new Client.Default(TrustingSSLSocketFactory.get(), null);
5454
Client disableHostnameVerification =
5555
new Client.Default(TrustingSSLSocketFactory.get(), new HostnameVerifier() {
@@ -116,7 +116,7 @@ public void patchUnsupported() throws IOException, InterruptedException {
116116

117117
@Test
118118
public void canOverrideSSLSocketFactory() throws IOException, InterruptedException {
119-
server.get().useHttps(TrustingSSLSocketFactory.get("localhost"), false);
119+
server.useHttps(TrustingSSLSocketFactory.get("localhost"), false);
120120
server.enqueue(new MockResponse());
121121

122122
TestInterface api = Feign.builder()
@@ -128,7 +128,7 @@ public void canOverrideSSLSocketFactory() throws IOException, InterruptedExcepti
128128

129129
@Test
130130
public void canOverrideHostnameVerifier() throws IOException, InterruptedException {
131-
server.get().useHttps(TrustingSSLSocketFactory.get("bad.example.com"), false);
131+
server.useHttps(TrustingSSLSocketFactory.get("bad.example.com"), false);
132132
server.enqueue(new MockResponse());
133133

134134
TestInterface api = Feign.builder()
@@ -140,7 +140,7 @@ public void canOverrideHostnameVerifier() throws IOException, InterruptedExcepti
140140

141141
@Test
142142
public void retriesFailedHandshake() throws IOException, InterruptedException {
143-
server.get().useHttps(TrustingSSLSocketFactory.get("localhost"), false);
143+
server.useHttps(TrustingSSLSocketFactory.get("localhost"), false);
144144
server.enqueue(new MockResponse().setSocketPolicy(SocketPolicy.FAIL_HANDSHAKE));
145145
server.enqueue(new MockResponse());
146146

‎httpclient/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ sourceCompatibility = 1.6
44

55
dependencies {
66
compile project(':feign-core')
7-
compile 'org.apache.httpcomponents:httpclient:4.4.1'
7+
compile 'org.apache.httpcomponents:httpclient:4.5'
88
testCompile 'junit:junit:4.12'
99
testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
10-
testCompile 'com.squareup.okhttp:mockwebserver:2.4.0'
10+
testCompile 'com.squareup.okhttp:mockwebserver:2.5.0'
1111
testCompile project(':feign-core').sourceSets.test.output // for assertions
1212
}

0 commit comments

Comments
 (0)