Browse Source

Upgrade to Kotlin 1.2.70

Includes Hibernate ORM 5.1.16 and Hibernate Validator 6.0.13.
pull/1958/head
Juergen Hoeller 7 years ago
parent
commit
cbc0fad961
  1. 6
      build.gradle
  2. 2
      spring-context-support/spring-context-support.gradle
  3. 2
      spring-test/spring-test.gradle
  4. 2
      spring-webflux/spring-webflux.gradle
  5. 2
      spring-webmvc/spring-webmvc.gradle

6
build.gradle

@ -11,7 +11,7 @@ buildscript {
// 3rd party plugin repositories can be configured in settings.gradle // 3rd party plugin repositories can be configured in settings.gradle
plugins { plugins {
id "io.spring.dependency-management" version "1.0.5.RELEASE" apply false id "io.spring.dependency-management" version "1.0.5.RELEASE" apply false
id "org.jetbrains.kotlin.jvm" version "1.2.61" apply false id "org.jetbrains.kotlin.jvm" version "1.2.70" apply false
id "org.jetbrains.dokka" version "0.9.17" id "org.jetbrains.dokka" version "0.9.17"
id "org.asciidoctor.convert" version "1.5.7" id "org.asciidoctor.convert" version "1.5.7"
} }
@ -35,7 +35,7 @@ ext {
jackson2Version = "2.9.6" jackson2Version = "2.9.6"
jettyVersion = "9.4.12.v20180830" jettyVersion = "9.4.12.v20180830"
junit5Version = "5.3.1" junit5Version = "5.3.1"
kotlinVersion = "1.2.61" kotlinVersion = "1.2.70"
log4jVersion = "2.11.1" log4jVersion = "2.11.1"
nettyVersion = "4.1.29.Final" nettyVersion = "4.1.29.Final"
reactorVersion = "Californium-RC1" reactorVersion = "Californium-RC1"
@ -277,7 +277,7 @@ configure(rootProject) {
testCompile("javax.servlet:javax.servlet-api:3.1.0") testCompile("javax.servlet:javax.servlet-api:3.1.0")
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.hibernate:hibernate-core:5.1.15.Final") testCompile("org.hibernate:hibernate-core:5.1.16.Final")
} }
artifacts { artifacts {

2
spring-context-support/spring-context-support.gradle

@ -16,7 +16,7 @@ dependencies {
optional("org.freemarker:freemarker:${freemarkerVersion}") optional("org.freemarker:freemarker:${freemarkerVersion}")
testCompile(project(":spring-context")) testCompile(project(":spring-context"))
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.hibernate:hibernate-validator:6.0.12.Final") testCompile("org.hibernate:hibernate-validator:6.0.13.Final")
testCompile("javax.annotation:javax.annotation-api:1.3.2") testCompile("javax.annotation:javax.annotation-api:1.3.2")
testRuntime("org.ehcache:jcache:1.0.1") testRuntime("org.ehcache:jcache:1.0.1")
testRuntime("org.ehcache:ehcache:3.4.0") testRuntime("org.ehcache:ehcache:3.4.0")

2
spring-test/spring-test.gradle

@ -61,7 +61,7 @@ dependencies {
testCompile("javax.interceptor:javax.interceptor-api:1.2.2") testCompile("javax.interceptor:javax.interceptor-api:1.2.2")
testCompile("javax.mail:javax.mail-api:1.6.2") testCompile("javax.mail:javax.mail-api:1.6.2")
testCompile("org.hibernate:hibernate-core:5.2.17.Final") testCompile("org.hibernate:hibernate-core:5.2.17.Final")
testCompile("org.hibernate:hibernate-validator:6.0.12.Final") testCompile("org.hibernate:hibernate-validator:6.0.13.Final")
// Enable use of the JUnit Platform Runner // Enable use of the JUnit Platform Runner
testCompile("org.junit.platform:junit-platform-runner") testCompile("org.junit.platform:junit-platform-runner")
testCompile("org.junit.jupiter:junit-jupiter-params") testCompile("org.junit.jupiter:junit-jupiter-params")

2
spring-webflux/spring-webflux.gradle

@ -41,7 +41,7 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
optional("com.google.protobuf:protobuf-java-util:3.6.1") optional("com.google.protobuf:protobuf-java-util:3.6.1")
testCompile("javax.xml.bind:jaxb-api:2.3.0") testCompile("javax.xml.bind:jaxb-api:2.3.0")
testCompile("org.hibernate:hibernate-validator:6.0.12.Final") testCompile("org.hibernate:hibernate-validator:6.0.13.Final")
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}" testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
testCompile("io.projectreactor:reactor-test") testCompile("io.projectreactor:reactor-test")
testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}") testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}")

2
spring-webmvc/spring-webmvc.gradle

@ -50,7 +50,7 @@ dependencies {
testCompile("org.eclipse.jetty:jetty-server") { testCompile("org.eclipse.jetty:jetty-server") {
exclude group: "javax.servlet", module: "javax.servlet" exclude group: "javax.servlet", module: "javax.servlet"
} }
testCompile("org.hibernate:hibernate-validator:6.0.12.Final") testCompile("org.hibernate:hibernate-validator:6.0.13.Final")
testCompile("org.apache.httpcomponents:httpclient:4.5.6") { testCompile("org.apache.httpcomponents:httpclient:4.5.6") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }

Loading…
Cancel
Save