Skip to content

Commit 02616fb

Browse files
committed
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.
1 parent 4a51acb commit 02616fb

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
plugins {
1515
id "com.gradle.build-scan" version "1.8"
1616
id "io.spring.dependency-management" version "1.0.3.RELEASE" apply false
17-
id "org.jetbrains.kotlin.jvm" version "1.2.51" apply false
17+
id "org.jetbrains.kotlin.jvm" version "1.2.71" apply false
1818
id "org.jetbrains.dokka" version "0.9.17"
1919
id "org.asciidoctor.convert" version "1.5.6"
2020
}
@@ -37,15 +37,15 @@ ext {
3737
}
3838

3939
aspectjVersion = "1.8.13"
40-
freemarkerVersion = "2.3.27-incubating"
40+
freemarkerVersion = "2.3.28"
4141
groovyVersion = "2.4.15"
4242
hsqldbVersion = "2.4.1"
4343
jackson2Version = "2.9.7"
4444
jettyVersion = "9.4.14.v20181114"
4545
junitJupiterVersion = "5.0.3"
4646
junitPlatformVersion = "1.0.3"
4747
junitVintageVersion = "4.12.3"
48-
kotlinVersion = "1.2.51"
48+
kotlinVersion = "1.2.71"
4949
log4jVersion = "2.11.1"
5050
nettyVersion = "4.1.31.Final"
5151
reactorVersion = "Bismuth-SR14"

spring-test/spring-test.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ dependencies {
7171
testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J)
7272
testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J)
7373
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
74-
testCompile("org.apache.httpcomponents:httpclient:4.5.5") {
74+
testCompile("org.apache.httpcomponents:httpclient:4.5.6") {
7575
exclude group: "commons-logging", module: "commons-logging"
7676
}
7777
testCompile("io.projectreactor.ipc:reactor-netty")

spring-web/spring-web.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ dependencies {
3636
optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
3737
exclude group: "javax.servlet", module: "javax.servlet-api"
3838
}
39-
optional("com.squareup.okhttp3:okhttp:3.10.0")
40-
optional("org.apache.httpcomponents:httpclient:4.5.5") {
39+
optional("com.squareup.okhttp3:okhttp:3.12.0")
40+
optional("org.apache.httpcomponents:httpclient:4.5.6") {
4141
exclude group: "commons-logging", module: "commons-logging"
4242
}
43-
optional("org.apache.httpcomponents:httpasyncclient:4.1.3") {
43+
optional("org.apache.httpcomponents:httpasyncclient:4.1.4") {
4444
exclude group: "commons-logging", module: "commons-logging"
4545
}
4646
optional("commons-fileupload:commons-fileupload:1.3.3")
@@ -72,7 +72,7 @@ dependencies {
7272
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
7373
testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}")
7474
testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}")
75-
testCompile("com.squareup.okhttp3:mockwebserver:3.10.0")
75+
testCompile("com.squareup.okhttp3:mockwebserver:3.12.0")
7676
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
7777
testCompile("org.skyscreamer:jsonassert:1.5.0")
7878
testCompile("org.xmlunit:xmlunit-matchers:2.5.1")

spring-webflux/spring-webflux.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") {
3434
exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec"
3535
}
36-
optional("org.apache.httpcomponents:httpclient:4.5.5") {
36+
optional("org.apache.httpcomponents:httpclient:4.5.6") {
3737
exclude group: "commons-logging", module: "commons-logging"
3838
}
3939
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
@@ -48,7 +48,7 @@ dependencies {
4848
testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}")
4949
testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}")
5050
testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}")
51-
testCompile("com.squareup.okhttp3:mockwebserver:3.10.0")
51+
testCompile("com.squareup.okhttp3:mockwebserver:3.12.0")
5252
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
5353
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
5454
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")

spring-webmvc/spring-webmvc.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ dependencies {
4949
testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") {
5050
exclude group: "javax.servlet", module: "javax.servlet"
5151
}
52-
testCompile("org.apache.httpcomponents:httpclient:4.5.5") {
52+
testCompile("org.apache.httpcomponents:httpclient:4.5.6") {
5353
exclude group: "commons-logging", module: "commons-logging"
5454
}
5555
testCompile("commons-fileupload:commons-fileupload:1.3.3")

0 commit comments

Comments
 (0)