Browse Source

Bumps dependency versions, most notably Gson 2.5 and OkHttp 2.7

pull/403/head
Adrian Cole 9 years ago
parent
commit
d36e78d3ef
  1. 4
      CHANGELOG.md
  2. 12
      benchmark/pom.xml
  3. 4
      core/build.gradle
  4. 2
      gson/build.gradle
  5. 6
      httpclient/build.gradle
  6. 4
      hystrix/build.gradle
  7. 4
      jackson-jaxb/build.gradle
  8. 2
      jackson/build.gradle
  9. 2
      jaxb/build.gradle
  10. 4
      okhttp/build.gradle
  11. 4
      ribbon/build.gradle
  12. 6
      slf4j/build.gradle

4
CHANGELOG.md

@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
### Version 8.13
* Never expands >8kb responses into memory
* Bumps dependency versions, most notably Gson 2.5 and OkHttp 2.7
### Version 8.12
* Adds `Feign.Builder.decode404()` to reduce boilerplate for empty semantics.

12
benchmark/pom.xml

@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
<name>Feign Benchmark (JMH)</name>
<properties>
<jmh.version>1.10.5</jmh.version>
<jmh.version>1.11.2</jmh.version>
</properties>
<dependencies>
@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>mockwebserver</artifactId>
<version>2.5.0</version>
<version>2.7.0</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle</groupId>
@ -44,17 +44,17 @@ @@ -44,17 +44,17 @@
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxnetty</artifactId>
<version>0.4.11</version>
<version>0.4.14</version>
</dependency>
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxjava</artifactId>
<version>1.0.13</version>
<version>1.0.17</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.0.30.Final</version>
<version>4.1.0.Beta8</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.1</version>
<version>2.4.2</version>
<executions>
<execution>
<phase>package</phase>

4
core/build.gradle

@ -6,6 +6,6 @@ sourceCompatibility = 1.6 @@ -6,6 +6,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.5.0'
testCompile 'com.google.code.gson:gson:2.3.1' // for example
testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
testCompile 'com.google.code.gson:gson:2.5' // for example
}

2
gson/build.gradle

@ -5,7 +5,7 @@ sourceCompatibility = 1.6 @@ -5,7 +5,7 @@ sourceCompatibility = 1.6
dependencies {
compile project(':feign-core')
compile 'com.google.code.gson:gson:2.3.1'
compile 'com.google.code.gson:gson:2.5'
testCompile 'junit:junit:4.12'
testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
testCompile project(':feign-core').sourceSets.test.output // for assertions

6
httpclient/build.gradle

@ -5,9 +5,9 @@ sourceCompatibility = 1.6 @@ -5,9 +5,9 @@ sourceCompatibility = 1.6
dependencies {
compile project(':feign-core')
compile 'org.apache.httpcomponents:httpclient:4.5'
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.5.0'
testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
testCompile project(':feign-core').sourceSets.test.output // for assertions
}
}

4
hystrix/build.gradle

@ -5,10 +5,10 @@ sourceCompatibility = 1.6 @@ -5,10 +5,10 @@ sourceCompatibility = 1.6
dependencies {
compile project(':feign-core')
compile 'com.netflix.hystrix:hystrix-core:1.4.18'
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.5.0'
testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
testCompile project(':feign-gson')
testCompile project(':feign-core').sourceSets.test.output // for assertions
}

4
jackson-jaxb/build.gradle

@ -6,9 +6,9 @@ sourceCompatibility = 1.6 @@ -6,9 +6,9 @@ sourceCompatibility = 1.6
dependencies {
compile project(':feign-core')
compile 'javax.ws.rs:jsr311-api:1.1.1'
compile 'com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.6.1'
compile 'com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.6.4'
testRuntime 'com.sun.jersey:jersey-client:1.19' // for RuntimeDelegateImpl
testCompile 'junit:junit:4.12'
testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
testCompile project(':feign-core').sourceSets.test.output // for assertions
}
}

2
jackson/build.gradle

@ -5,7 +5,7 @@ sourceCompatibility = 1.6 @@ -5,7 +5,7 @@ sourceCompatibility = 1.6
dependencies {
compile project(':feign-core')
compile 'com.fasterxml.jackson.core:jackson-databind:2.6.1'
compile 'com.fasterxml.jackson.core:jackson-databind:2.6.4'
testCompile 'junit:junit:4.12'
testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
testCompile project(':feign-core').sourceSets.test.output // for assertions

2
jaxb/build.gradle

@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
apply plugin: 'java'
apply plugin: 'osgi'
sourceCompatibility = 1.6
dependencies {
compile project(':feign-core')
testCompile 'junit:junit:4.12'

4
okhttp/build.gradle

@ -5,9 +5,9 @@ sourceCompatibility = 1.6 @@ -5,9 +5,9 @@ sourceCompatibility = 1.6
dependencies {
compile project(':feign-core')
compile 'com.squareup.okhttp:okhttp:2.5.0'
compile 'com.squareup.okhttp:okhttp:2.7.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.5.0'
testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
testCompile project(':feign-core').sourceSets.test.output // for assertions
}

4
ribbon/build.gradle

@ -5,9 +5,9 @@ sourceCompatibility = 1.6 @@ -5,9 +5,9 @@ sourceCompatibility = 1.6
dependencies {
compile project(':feign-core')
compile 'com.netflix.ribbon:ribbon-loadbalancer:2.1.0'
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.5.0'
testCompile 'com.squareup.okhttp:mockwebserver:2.7.0'
testCompile project(':feign-core').sourceSets.test.output
}

6
slf4j/build.gradle

@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
apply plugin: 'java'
apply plugin: 'osgi'
sourceCompatibility = 1.6
dependencies {
compile project(':feign-core')
compile 'org.slf4j:slf4j-api:1.7.12'
compile 'org.slf4j:slf4j-api:1.7.13'
testCompile 'junit:junit:4.12'
testCompile 'org.assertj:assertj-core:1.7.1' // last version supporting JDK 7
testCompile 'org.slf4j:slf4j-simple:1.7.12'
testCompile 'org.slf4j:slf4j-simple:1.7.13'
}

Loading…
Cancel
Save