From 095fd5bcb316f2cb1dd39f340683ffd67dbed1a9 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Fri, 19 Jul 2019 10:20:35 +0200 Subject: [PATCH] Use Kotlin BOM Close gh-23316 --- build.gradle | 1 + spring-beans/spring-beans.gradle | 4 ++-- spring-context/spring-context.gradle | 4 ++-- spring-core-coroutines/spring-core-coroutines.gradle | 4 ++-- spring-core/spring-core.gradle | 4 ++-- spring-jdbc/spring-jdbc.gradle | 4 ++-- spring-messaging/spring-messaging.gradle | 4 ++-- spring-test/spring-test.gradle | 4 ++-- spring-web/spring-web.gradle | 6 +++--- spring-webflux/spring-webflux.gradle | 8 ++++---- spring-webmvc/spring-webmvc.gradle | 8 ++++---- 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index 632eecf401..3ea138eb7d 100644 --- a/build.gradle +++ b/build.gradle @@ -78,6 +78,7 @@ configure(allprojects) { project -> } imports { mavenBom "org.junit:junit-bom:${junit5Version}" + mavenBom "org.jetbrains.kotlin:kotlin-bom:${kotlinVersion}" } } diff --git a/spring-beans/spring-beans.gradle b/spring-beans/spring-beans.gradle index b7524b5ee1..5cf65df404 100644 --- a/spring-beans/spring-beans.gradle +++ b/spring-beans/spring-beans.gradle @@ -7,8 +7,8 @@ dependencies { optional("javax.inject:javax.inject:1") optional("org.yaml:snakeyaml:1.24") optional("org.codehaus.groovy:groovy-xml:${groovyVersion}") - optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") - optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") + optional("org.jetbrains.kotlin:kotlin-reflect") + optional("org.jetbrains.kotlin:kotlin-stdlib") testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") } diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle index 51b395baf2..4b6b966e13 100644 --- a/spring-context/spring-context.gradle +++ b/spring-context/spring-context.gradle @@ -27,8 +27,8 @@ dependencies { optional("org.beanshell:bsh:2.0b5") optional("joda-time:joda-time:2.10.1") optional("org.hibernate:hibernate-validator:5.4.3.Final") - optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") - optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") + optional("org.jetbrains.kotlin:kotlin-reflect") + optional("org.jetbrains.kotlin:kotlin-stdlib") optional("org.reactivestreams:reactive-streams") testCompile("io.projectreactor:reactor-core") testCompile("org.codehaus.groovy:groovy-jsr223:${groovyVersion}") diff --git a/spring-core-coroutines/spring-core-coroutines.gradle b/spring-core-coroutines/spring-core-coroutines.gradle index 711824df97..23b6bfe6fa 100644 --- a/spring-core-coroutines/spring-core-coroutines.gradle +++ b/spring-core-coroutines/spring-core-coroutines.gradle @@ -1,8 +1,8 @@ description = "Spring Core Coroutines support" dependencies { - compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") - compile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") + compile("org.jetbrains.kotlin:kotlin-reflect") + compile("org.jetbrains.kotlin:kotlin-stdlib") compile("io.projectreactor:reactor-core") compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutinesVersion}") compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:${coroutinesVersion}") diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle index 2b80b71b94..3a63e5b681 100644 --- a/spring-core/spring-core.gradle +++ b/spring-core/spring-core.gradle @@ -76,8 +76,8 @@ dependencies { compileOnly(project(":spring-core-coroutines")) optional("net.sf.jopt-simple:jopt-simple:5.0.4") optional("org.aspectj:aspectjweaver:${aspectjVersion}") - optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") - optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") + optional("org.jetbrains.kotlin:kotlin-reflect") + optional("org.jetbrains.kotlin:kotlin-stdlib") optional("io.projectreactor:reactor-core") optional("io.reactivex:rxjava:${rxjavaVersion}") optional("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}") diff --git a/spring-jdbc/spring-jdbc.gradle b/spring-jdbc/spring-jdbc.gradle index 50cb93b831..2339e0828c 100644 --- a/spring-jdbc/spring-jdbc.gradle +++ b/spring-jdbc/spring-jdbc.gradle @@ -10,6 +10,6 @@ dependencies { optional("com.h2database:h2:1.4.199") optional("org.apache.derby:derby:10.14.2.0") optional("org.apache.derby:derbyclient:10.14.2.0") - optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") - optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") + optional("org.jetbrains.kotlin:kotlin-reflect") + optional("org.jetbrains.kotlin:kotlin-stdlib") } diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle index 7a60aee469..ab17d83359 100644 --- a/spring-messaging/spring-messaging.gradle +++ b/spring-messaging/spring-messaging.gradle @@ -31,8 +31,8 @@ dependencies { testCompile("org.apache.activemq:activemq-stomp:5.8.0") testCompile("io.projectreactor:reactor-test") testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}" - testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") - testCompile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") + testCompile("org.jetbrains.kotlin:kotlin-reflect") + testCompile("org.jetbrains.kotlin:kotlin-stdlib") testCompile("org.xmlunit:xmlunit-assertj:2.6.2") testCompile("org.xmlunit:xmlunit-matchers:2.6.2") testCompile(project(":spring-core-coroutines")) diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index 096684bd8b..8bac3ee1e9 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -50,8 +50,8 @@ dependencies { optional("org.xmlunit:xmlunit-matchers:2.6.2") optional("org.skyscreamer:jsonassert:1.5.0") optional("com.jayway.jsonpath:json-path:2.4.0") - optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") - optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") + optional("org.jetbrains.kotlin:kotlin-reflect") + optional("org.jetbrains.kotlin:kotlin-stdlib") optional("io.projectreactor:reactor-test") optional("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutinesVersion}") optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:${coroutinesVersion}") diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 05aae6f825..4f1bce5688 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -61,8 +61,8 @@ dependencies { optional("com.rometools:rome:1.12.0") optional("com.caucho:hessian:4.0.51") optional("org.codehaus.groovy:groovy:${groovyVersion}") - optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") - optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") + optional("org.jetbrains.kotlin:kotlin-reflect") + optional("org.jetbrains.kotlin:kotlin-stdlib") testCompile("io.projectreactor:reactor-test") testCompile("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") { exclude group: "org.apache.taglibs", module: "taglibs-standard-spec" @@ -76,7 +76,7 @@ dependencies { testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-servlet") testCompile("com.squareup.okhttp3:mockwebserver:3.14.2") - testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") + testCompile("org.jetbrains.kotlin:kotlin-reflect") testCompile("org.skyscreamer:jsonassert:1.5.0") testCompile("org.xmlunit:xmlunit-matchers:2.6.2") testCompile("org.xmlunit:xmlunit-assertj:2.6.2") diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index df349ce1b7..9d1bf280c5 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -38,8 +38,8 @@ dependencies { optional("org.apache.httpcomponents:httpclient:4.5.9") { exclude group: "commons-logging", module: "commons-logging" } - optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") - optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") + optional("org.jetbrains.kotlin:kotlin-reflect") + optional("org.jetbrains.kotlin:kotlin-stdlib") optional("com.google.protobuf:protobuf-java-util:3.7.1") optional("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutinesVersion}") optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:${coroutinesVersion}") @@ -56,8 +56,8 @@ dependencies { testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3") testCompile("com.squareup.okhttp3:mockwebserver:3.14.2") testCompile(project(":spring-core-coroutines")) - testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") - testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223-embeddable:${kotlinVersion}") + testCompile("org.jetbrains.kotlin:kotlin-script-runtime") + testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223-embeddable") testRuntime("org.jruby:jruby:9.2.7.0") testRuntime("org.python:jython-standalone:2.7.1") testRuntime("org.synchronoss.cloud:nio-multipart-parser:1.1.0") diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index 65645f9b38..b6b6d499f6 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -40,8 +40,8 @@ dependencies { exclude group: "org.slf4j", module: "jcl-over-slf4j" } optional("org.codehaus.groovy:groovy-templates:${groovyVersion}") - optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") - optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") + optional("org.jetbrains.kotlin:kotlin-reflect") + optional("org.jetbrains.kotlin:kotlin-stdlib") optional("org.reactivestreams:reactive-streams") testCompile("javax.servlet:javax.servlet-api:4.0.1") testCompile("org.eclipse.jetty:jetty-servlet") { @@ -72,8 +72,8 @@ dependencies { testCompile("io.reactivex:rxjava:${rxjavaVersion}") testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}") testCompile("io.reactivex.rxjava2:rxjava:${rxjava2Version}") - testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") - testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223-embeddable:${kotlinVersion}") + testCompile("org.jetbrains.kotlin:kotlin-script-runtime") + testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223-embeddable") testRuntime("org.jruby:jruby:9.2.7.0") testRuntime("org.python:jython-standalone:2.7.1") testRuntime("org.webjars:underscorejs:1.8.3")