Skip to content

Commit

Permalink
Updates to okhttp 2.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrian Cole committed Jan 6, 2016
1 parent 6a8359f commit 7c0ddbf
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion benchmark/pom.xml
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>mockwebserver</artifactId>
<version>2.7.0</version>
<version>2.7.1</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle
Expand Up @@ -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.7.0'
testCompile 'com.squareup.okhttp:mockwebserver:2.7.1'
testCompile 'com.google.code.gson:gson:2.5' // for example
}
2 changes: 1 addition & 1 deletion httpclient/build.gradle
Expand Up @@ -7,6 +7,6 @@ dependencies {
compile 'org.apache.httpcomponents:httpclient:4.5.1'
testCompile 'junit:junit:4.12'
testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
testCompile 'com.squareup.okhttp:mockwebserver:2.7.1'
testCompile project(':feign-core').sourceSets.test.output // for assertions
}
2 changes: 1 addition & 1 deletion hystrix/build.gradle
Expand Up @@ -7,7 +7,7 @@ dependencies {
compile 'com.netflix.hystrix:hystrix-core:1.4.21'
testCompile 'junit:junit:4.12'
testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
testCompile 'com.squareup.okhttp:mockwebserver:2.7.1'
testCompile project(':feign-gson')
testCompile project(':feign-core').sourceSets.test.output // for assertions
}
Expand Up @@ -33,10 +33,10 @@

final class HystrixInvocationHandler implements InvocationHandler {

private final Target target;
private final Target<?> target;
private final Map<Method, MethodHandler> dispatch;

HystrixInvocationHandler(Target target, Map<Method, MethodHandler> dispatch) {
HystrixInvocationHandler(Target<?> target, Map<Method, MethodHandler> dispatch) {
this.target = checkNotNull(target, "target");
this.dispatch = checkNotNull(dispatch, "dispatch");
}
Expand Down
4 changes: 2 additions & 2 deletions okhttp/build.gradle
Expand Up @@ -4,9 +4,9 @@ sourceCompatibility = 1.6

dependencies {
compile project(':feign-core')
compile 'com.squareup.okhttp:okhttp:2.7.0'
compile 'com.squareup.okhttp:okhttp:2.7.1'
testCompile 'junit:junit:4.12'
testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
testCompile 'com.squareup.okhttp:mockwebserver:2.7.1'
testCompile project(':feign-core').sourceSets.test.output // for assertions
}
2 changes: 1 addition & 1 deletion ribbon/build.gradle
Expand Up @@ -7,6 +7,6 @@ dependencies {
compile 'com.netflix.ribbon:ribbon-loadbalancer:2.1.1'
testCompile 'junit:junit:4.12'
testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
testCompile 'com.squareup.okhttp:mockwebserver:2.7.1'
testCompile project(':feign-core').sourceSets.test.output
}

0 comments on commit 7c0ddbf

Please sign in to comment.