Skip to content

Commit 7cbddf1

Browse files
committed
Merge pull request OpenFeign#303 from Netflix/bumps
Bumps dependency versions, most notably Gson 2.5 and OkHttp 2.7
2 parents 10ee72c + 4f86d15 commit 7cbddf1

12 files changed

Lines changed: 31 additions & 23 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### Version 8.13
2+
* Never expands >8kb responses into memory
3+
* Bumps dependency versions, most notably Gson 2.5 and OkHttp 2.7
4+
15
### Version 8.12
26
* Adds `Feign.Builder.decode404()` to reduce boilerplate for empty semantics.
37

‎benchmark/pom.xml‎

Lines changed: 6 additions & 6 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.5</jmh.version>
19+
<jmh.version>1.11.2</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.5.0</version>
36+
<version>2.7.0</version>
3737
<exclusions>
3838
<exclusion>
3939
<groupId>org.bouncycastle</groupId>
@@ -44,17 +44,17 @@
4444
<dependency>
4545
<groupId>io.reactivex</groupId>
4646
<artifactId>rxnetty</artifactId>
47-
<version>0.4.11</version>
47+
<version>0.4.14</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>io.reactivex</groupId>
5151
<artifactId>rxjava</artifactId>
52-
<version>1.0.13</version>
52+
<version>1.0.17</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>io.netty</groupId>
5656
<artifactId>netty-codec-http</artifactId>
57-
<version>4.0.30.Final</version>
57+
<version>4.1.0.Beta8</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>org.openjdk.jmh</groupId>
@@ -75,7 +75,7 @@
7575
<plugin>
7676
<groupId>org.apache.maven.plugins</groupId>
7777
<artifactId>maven-shade-plugin</artifactId>
78-
<version>2.4.1</version>
78+
<version>2.4.2</version>
7979
<executions>
8080
<execution>
8181
<phase>package</phase>

‎core/build.gradle‎

Lines changed: 2 additions & 2 deletions
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.5.0'
9-
testCompile 'com.google.code.gson:gson:2.3.1' // for example
8+
testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
9+
testCompile 'com.google.code.gson:gson:2.5' // for example
1010
}

‎gson/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ sourceCompatibility = 1.6
44

55
dependencies {
66
compile project(':feign-core')
7-
compile 'com.google.code.gson:gson:2.3.1'
7+
compile 'com.google.code.gson:gson:2.5'
88
testCompile 'junit:junit:4.12'
99
testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
1010
testCompile project(':feign-core').sourceSets.test.output // for assertions

‎httpclient/build.gradle‎

Lines changed: 3 additions & 3 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.5'
7+
compile 'org.apache.httpcomponents:httpclient:4.5.1'
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.5.0'
10+
testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
1111
testCompile project(':feign-core').sourceSets.test.output // for assertions
12-
}
12+
}

‎hystrix/build.gradle‎

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

55
dependencies {
66
compile project(':feign-core')
7-
compile 'com.netflix.hystrix:hystrix-core:1.4.18'
7+
compile 'com.netflix.hystrix:hystrix-core:1.4.21'
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.5.0'
10+
testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
1111
testCompile project(':feign-gson')
1212
testCompile project(':feign-core').sourceSets.test.output // for assertions
1313
}

‎jackson-jaxb/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ sourceCompatibility = 1.6
55
dependencies {
66
compile project(':feign-core')
77
compile 'javax.ws.rs:jsr311-api:1.1.1'
8-
compile 'com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.6.1'
8+
compile 'com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.6.4'
99
testRuntime 'com.sun.jersey:jersey-client:1.19' // for RuntimeDelegateImpl
1010
testCompile 'junit:junit:4.12'
1111
testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
1212
testCompile project(':feign-core').sourceSets.test.output // for assertions
13-
}
13+
}

‎jackson/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ sourceCompatibility = 1.6
44

55
dependencies {
66
compile project(':feign-core')
7-
compile 'com.fasterxml.jackson.core:jackson-databind:2.6.1'
7+
compile 'com.fasterxml.jackson.core:jackson-databind:2.6.4'
88
testCompile 'junit:junit:4.12'
99
testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
1010
testCompile project(':feign-core').sourceSets.test.output // for assertions

‎jaxb/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
apply plugin: 'java'
22

3+
sourceCompatibility = 1.6
4+
35
dependencies {
46
compile project(':feign-core')
57
testCompile 'junit:junit:4.12'

‎okhttp/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 'com.squareup.okhttp:okhttp:2.5.0'
7+
compile 'com.squareup.okhttp:okhttp:2.7.0'
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.5.0'
10+
testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
1111
testCompile project(':feign-core').sourceSets.test.output // for assertions
1212
}

0 commit comments

Comments
 (0)