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

Upgrade to Kotlin 1.2.71, OkHttp 3.12, FreeMarker 2.3.28

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@@ -14,7 +14,7 @@ buildscript {
plugins {
id "com.gradle.build-scan" version "1.8"
id "io.spring.dependency-management" version "1.0.3.RELEASE" apply false
id "org.jetbrains.kotlin.jvm" version "1.2.51" apply false
id "org.jetbrains.kotlin.jvm" version "1.2.71" apply false
id "org.jetbrains.dokka" version "0.9.17"
id "org.asciidoctor.convert" version "1.5.6"
}
@@ -37,7 +37,7 @@ ext {
}
aspectjVersion = "1.8.13"
freemarkerVersion = "2.3.27-incubating"
freemarkerVersion = "2.3.28"
groovyVersion = "2.4.15"
hsqldbVersion = "2.4.1"
jackson2Version = "2.9.7"
@@ -45,7 +45,7 @@ ext {
junitJupiterVersion = "5.0.3"
junitPlatformVersion = "1.0.3"
junitVintageVersion = "4.12.3"
kotlinVersion = "1.2.51"
kotlinVersion = "1.2.71"
log4jVersion = "2.11.1"
nettyVersion = "4.1.31.Final"
reactorVersion = "Bismuth-SR14"

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

@@ -71,7 +71,7 @@ dependencies {
testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J)
testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J)
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.apache.httpcomponents:httpclient:4.5.5") {
testCompile("org.apache.httpcomponents:httpclient:4.5.6") {
exclude group: "commons-logging", module: "commons-logging"
}
testCompile("io.projectreactor.ipc:reactor-netty")

8
spring-web/spring-web.gradle
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")

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

@@ -33,7 +33,7 @@ dependencies {
optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") {
exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec"
}
optional("org.apache.httpcomponents:httpclient:4.5.5") {
optional("org.apache.httpcomponents:httpclient:4.5.6") {
exclude group: "commons-logging", module: "commons-logging"
}
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
@@ -48,7 +48,7 @@ dependencies {
testCompile("org.apache.tomcat:tomcat-util:${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-script-runtime:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")

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

@@ -49,7 +49,7 @@ dependencies {
testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") {
exclude group: "javax.servlet", module: "javax.servlet"
}
testCompile("org.apache.httpcomponents:httpclient:4.5.5") {
testCompile("org.apache.httpcomponents:httpclient:4.5.6") {
exclude group: "commons-logging", module: "commons-logging"
}
testCompile("commons-fileupload:commons-fileupload:1.3.3")