From c441d60d1d94e795c7672d55647809d1e3262575 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Sat, 24 Mar 2018 16:48:53 +0100
Subject: [PATCH] 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.
---
 build.gradle                   | 6 +++---
 spring-jdbc/spring-jdbc.gradle | 2 +-
 spring-test/spring-test.gradle | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index e436fc9b450..1e15a0dc406 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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"
diff --git a/spring-jdbc/spring-jdbc.gradle b/spring-jdbc/spring-jdbc.gradle
index ece6bd4db5b..1774490f362 100644
--- a/spring-jdbc/spring-jdbc.gradle
+++ b/spring-jdbc/spring-jdbc.gradle
@@ -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}")
diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index 9e98ed0bfb0..14bbad3a923 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -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") {