Browse Source

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.
pull/1737/merge
Juergen Hoeller 8 years ago
parent
commit
c441d60d1d
  1. 6
      build.gradle
  2. 2
      spring-jdbc/spring-jdbc.gradle
  3. 2
      spring-test/spring-test.gradle

6
build.gradle

@ -14,7 +14,7 @@ buildscript {
plugins { plugins {
id "com.gradle.build-scan" version "1.8" id "com.gradle.build-scan" version "1.8"
id "io.spring.dependency-management" version "1.0.3.RELEASE" apply false 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.jetbrains.dokka" version "0.9.16"
id "org.asciidoctor.convert" version "1.5.6" id "org.asciidoctor.convert" version "1.5.6"
} }
@ -50,13 +50,13 @@ configure(allprojects) { project ->
ext.junitJupiterVersion = "5.0.3" ext.junitJupiterVersion = "5.0.3"
ext.junitPlatformVersion = "1.0.3" ext.junitPlatformVersion = "1.0.3"
ext.junitVintageVersion = "4.12.3" ext.junitVintageVersion = "4.12.3"
ext.kotlinVersion = "1.2.30" ext.kotlinVersion = "1.2.31"
ext.log4jVersion = "2.11.0" ext.log4jVersion = "2.11.0"
ext.nettyVersion = "4.1.22.Final" ext.nettyVersion = "4.1.22.Final"
ext.reactorVersion = "Bismuth-SR7" ext.reactorVersion = "Bismuth-SR7"
ext.rxjavaVersion = "1.3.7" ext.rxjavaVersion = "1.3.7"
ext.rxjavaAdapterVersion = "1.2.1" 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.slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
ext.tiles3Version = "3.0.8" ext.tiles3Version = "3.0.8"
ext.tomcatVersion = "8.5.29" ext.tomcatVersion = "8.5.29"

2
spring-jdbc/spring-jdbc.gradle

@ -7,7 +7,7 @@ dependencies {
optional(project(":spring-context")) // for JndiDataSourceLookup optional(project(":spring-context")) // for JndiDataSourceLookup
optional("javax.transaction:javax.transaction-api:1.2") optional("javax.transaction:javax.transaction-api:1.2")
optional("org.hsqldb:hsqldb:${hsqldbVersion}") 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:derby:10.14.1.0")
optional("org.apache.derby:derbyclient:10.14.1.0") optional("org.apache.derby:derbyclient:10.14.1.0")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")

2
spring-test/spring-test.gradle

@ -45,7 +45,7 @@ dependencies {
optional("net.sourceforge.htmlunit:htmlunit:2.29") { optional("net.sourceforge.htmlunit:htmlunit:2.29") {
exclude group: "commons-logging", module: "commons-logging" 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" exclude group: "commons-logging", module: "commons-logging"
} }
optional("org.seleniumhq.selenium:selenium-java:3.11.0") { optional("org.seleniumhq.selenium:selenium-java:3.11.0") {

Loading…
Cancel
Save