Upgrade to Kotlin 1.2.71, OkHttp 3.12, FreeMarker 2.3.28

Also includes Apache HttpClient 4.5.6 and HttpAsyncClient 4.1.4.
This commit is contained in:
Juergen Hoeller
2018-11-24 14:44:57 +01:00
parent 4a51acbeb2
commit 02616fbabd
5 changed files with 11 additions and 11 deletions

View File

@@ -36,11 +36,11 @@ dependencies {
optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
exclude group: "javax.servlet", module: "javax.servlet-api"
}
optional("com.squareup.okhttp3:okhttp:3.10.0")
optional("org.apache.httpcomponents:httpclient:4.5.5") {
optional("com.squareup.okhttp3:okhttp:3.12.0")
optional("org.apache.httpcomponents:httpclient:4.5.6") {
exclude group: "commons-logging", module: "commons-logging"
}
optional("org.apache.httpcomponents:httpasyncclient:4.1.3") {
optional("org.apache.httpcomponents:httpasyncclient:4.1.4") {
exclude group: "commons-logging", module: "commons-logging"
}
optional("commons-fileupload:commons-fileupload:1.3.3")
@@ -72,7 +72,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.10.0")
testCompile("com.squareup.okhttp3:mockwebserver:3.12.0")
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile("org.skyscreamer:jsonassert:1.5.0")
testCompile("org.xmlunit:xmlunit-matchers:2.5.1")