Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to OkHttp 3.10 (as well as RxJava 2.1.10 and Caffeine 2.6.2)

Browse Source
This commit is contained in:
Juergen Hoeller
2018-02-25 15:38:56 +01:00
parent 9e55422334
commit 0ef9568c06
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -56,7 +56,7 @@ configure(allprojects) { project ->
ext.reactorVersion = "Bismuth-SR6"
ext.rxjavaVersion = "1.3.6"
ext.rxjavaAdapterVersion = "1.2.1"
ext.rxjava2Version = "2.1.9"
ext.rxjava2Version = "2.1.10"
ext.slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
ext.tiles3Version = "3.0.8"
ext.tomcatVersion = "8.5.28"

2
spring-context-support/spring-context-support.gradle
View File

@@ -9,7 +9,7 @@ dependencies {
optional("javax.activation:activation:1.1.1")
optional("javax.mail:javax.mail-api:1.6.1")
optional("javax.cache:cache-api:1.1.0")
optional("com.github.ben-manes.caffeine:caffeine:2.6.1")
optional("com.github.ben-manes.caffeine:caffeine:2.6.2")
optional("net.sf.ehcache:ehcache:2.10.4")
optional("org.quartz-scheduler:quartz:2.3.0")
optional("org.codehaus.fabric3.api:commonj:1.1.0")

4
spring-web/spring-web.gradle
View File

@@ -42,7 +42,7 @@ dependencies {
exclude group: "javax.servlet", module: "javax.servlet-api"
}
optional("io.undertow:undertow-core:${undertowVersion}")
optional("com.squareup.okhttp3:okhttp:3.9.1")
optional("com.squareup.okhttp3:okhttp:3.10.0")
optional("org.apache.httpcomponents:httpclient:4.5.5") {
exclude group: "commons-logging", module: "commons-logging"
}
@@ -78,7 +78,7 @@ dependencies {
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}")
testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}")
testCompile("com.squareup.okhttp3:mockwebserver:3.9.1")
testCompile("com.squareup.okhttp3:mockwebserver:3.10.0")
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile("org.skyscreamer:jsonassert:1.5.0")
testRuntime("com.sun.mail:javax.mail:1.6.1")

2
spring-webflux/spring-webflux.gradle
View File

@@ -54,7 +54,7 @@ dependencies {
testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}")
testCompile("io.undertow:undertow-core:${undertowVersion}")
testCompile("com.fasterxml:aalto-xml:1.0.0")
testCompile("com.squareup.okhttp3:mockwebserver:3.9.1")
testCompile("com.squareup.okhttp3:mockwebserver:3.10.0")
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")