root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to Kotlin 1.2.31 and RxJava 2.1.12 

Includes H2 1.4.197 and Selenium HtmlUnit Driver 2.29.3 as well.
This commit is contained in:
Juergen Hoeller 2018-03-24 16:48:53 +01:00
parent 8d5587fe4f
commit c441d60d1d
3 changed files with 5 additions and 5 deletions
Show Stats 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.30" apply false
id "org.jetbrains.kotlin.jvm" version "1.2.31" apply false
id "org.jetbrains.dokka" version "0.9.16"
id "org.asciidoctor.convert" version "1.5.6"
}
@ -50,13 +50,13 @@ configure(allprojects) { project ->
ext.junitJupiterVersion = "5.0.3"
ext.junitPlatformVersion = "1.0.3"
ext.junitVintageVersion = "4.12.3"
ext.kotlinVersion = "1.2.30"
ext.kotlinVersion = "1.2.31"
ext.log4jVersion = "2.11.0"
ext.nettyVersion = "4.1.22.Final"
ext.reactorVersion = "Bismuth-SR7"
ext.rxjavaVersion = "1.3.7"
ext.rxjavaAdapterVersion = "1.2.1"
ext.rxjava2Version = "2.1.11"
ext.rxjava2Version = "2.1.12"
ext.slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
ext.tiles3Version = "3.0.8"
ext.tomcatVersion = "8.5.29"

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

@ -7,7 +7,7 @@ dependencies {
optional(project(":spring-context")) // for JndiDataSourceLookup
optional("javax.transaction:javax.transaction-api:1.2")
optional("org.hsqldb:hsqldb:${hsqldbVersion}")
optional("com.h2database:h2:1.4.196")
optional("com.h2database:h2:1.4.197")
optional("org.apache.derby:derby:10.14.1.0")
optional("org.apache.derby:derbyclient:10.14.1.0")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")

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

@ -45,7 +45,7 @@ dependencies {
optional("net.sourceforge.htmlunit:htmlunit:2.29") {
exclude group: "commons-logging", module: "commons-logging"
}
optional("org.seleniumhq.selenium:htmlunit-driver:2.29.2") {
optional("org.seleniumhq.selenium:htmlunit-driver:2.29.3") {
exclude group: "commons-logging", module: "commons-logging"
}
optional("org.seleniumhq.selenium:selenium-java:3.11.0") {