Skip to content

Commit 397fd24

Browse files
bclozelbclozel
committed
Revert "Leverage Kotlin plugin dependency management"
This reverts commit 3e2f6c8.
1 parent a1e898f commit 397fd24

File tree

10 files changed

+26
-25
lines changed

10 files changed

+26
-25
lines changed

‎build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ configure(allprojects) { project ->
5454
ext.junitJupiterVersion = '5.0.0-RC2'
5555
ext.junitPlatformVersion = '1.0.0-RC2'
5656
ext.junitVintageVersion = "4.12.0-RC2"
57+
ext.kotlinVersion = '1.1.4'
5758
ext.log4jVersion = '2.8.2'
5859
ext.nettyVersion = "4.1.14.Final"
5960
ext.okhttp3Version = "3.8.1"

‎spring-beans/spring-beans.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ apply plugin: "groovy"
55
dependencies {
66
compile(project(':spring-core'))
77
optional("javax.inject:javax.inject:1")
8-
optional("org.jetbrains.kotlin:kotlin-reflect")
9-
optional("org.jetbrains.kotlin:kotlin-stdlib")
8+
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
9+
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
1010
optional("org.yaml:snakeyaml:1.18")
1111
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
1212
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")

‎spring-context/spring-context.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ dependencies {
2121
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
2222
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
2323
optional("org.beanshell:bsh:2.0b5")
24-
optional("org.jetbrains.kotlin:kotlin-reflect")
25-
optional("org.jetbrains.kotlin:kotlin-stdlib")
24+
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
25+
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
2626
testCompile("org.apache.commons:commons-pool2:2.4.2")
2727
testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
2828
testCompile("javax.inject:javax.inject-tck:1")

‎spring-core/spring-core.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ dependencies {
7878
compile(project(":spring-jcl"))
7979
optional("net.sf.jopt-simple:jopt-simple:5.0.3")
8080
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
81-
optional("org.jetbrains.kotlin:kotlin-reflect")
82-
optional("org.jetbrains.kotlin:kotlin-stdlib")
81+
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
82+
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
8383
optional("io.projectreactor:reactor-core")
8484
optional("io.reactivex:rxjava:${rxjavaVersion}")
8585
optional("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")

‎spring-jdbc/spring-jdbc.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ dependencies {
1010
optional("com.h2database:h2:1.4.196")
1111
optional("org.apache.derby:derby:10.13.1.1")
1212
optional("org.apache.derby:derbyclient:10.13.1.1")
13-
optional("org.jetbrains.kotlin:kotlin-reflect")
14-
optional("org.jetbrains.kotlin:kotlin-stdlib")
13+
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
14+
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
1515
}

‎spring-messaging/spring-messaging.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ dependencies {
3939
}
4040
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
4141
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
42-
testCompile("org.jetbrains.kotlin:kotlin-reflect")
43-
testCompile("org.jetbrains.kotlin:kotlin-stdlib")
42+
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
43+
testCompile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
4444
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
4545
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
4646
testRuntime("javax.activation:activation:${activationVersion}")

‎spring-test/spring-test.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ dependencies {
5252
optional("org.xmlunit:xmlunit-matchers:2.3.0")
5353
optional("org.skyscreamer:jsonassert:1.5.0")
5454
optional("com.jayway.jsonpath:json-path:2.4.0")
55-
optional("org.jetbrains.kotlin:kotlin-reflect")
56-
optional("org.jetbrains.kotlin:kotlin-stdlib")
55+
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
56+
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
5757
optional("io.projectreactor:reactor-test")
5858
testCompile(project(":spring-context-support"))
5959
testCompile(project(":spring-oxm"))

‎spring-web/spring-web.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ dependencies {
6565
optional("javax.xml.bind:jaxb-api:${jaxbVersion}")
6666
optional("javax.xml.ws:jaxws-api:${jaxwsVersion}")
6767
optional("javax.mail:javax.mail-api:${javamailVersion}")
68-
optional("org.jetbrains.kotlin:kotlin-reflect")
69-
optional("org.jetbrains.kotlin:kotlin-stdlib")
68+
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
69+
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
7070
testCompile("io.projectreactor:reactor-test")
7171
testCompile("org.apache.taglibs:taglibs-standard-jstlel:1.2.1") {
7272
exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
@@ -82,7 +82,7 @@ dependencies {
8282
exclude group: 'io.reactivex', module: 'rxjava'
8383
}
8484
testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
85-
testCompile("org.jetbrains.kotlin:kotlin-reflect")
85+
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
8686
testCompile("org.skyscreamer:jsonassert:1.5.0")
8787
testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
8888
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")

‎spring-webflux/spring-webflux.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ dependencies {
4242
optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") {
4343
exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec"
4444
}
45-
optional("org.jetbrains.kotlin:kotlin-reflect")
46-
optional("org.jetbrains.kotlin:kotlin-stdlib")
45+
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
46+
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
4747
testCompile("javax.xml.bind:jaxb-api:${jaxbVersion}")
4848
testCompile("io.projectreactor:reactor-test")
4949
testCompile("org.hibernate:hibernate-validator:6.0.1.Final")
@@ -58,9 +58,9 @@ dependencies {
5858
}
5959
testCompile("com.fasterxml:aalto-xml:1.0.0")
6060
testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
61-
testCompile("org.jetbrains.kotlin:kotlin-script-runtime")
62-
testRuntime("org.jetbrains.kotlin:kotlin-script-util")
63-
testRuntime("org.jetbrains.kotlin:kotlin-compiler")
61+
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
62+
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
63+
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")
6464
testRuntime("org.jruby:jruby:9.1.12.0")
6565
testRuntime("org.python:jython-standalone:2.7.1")
6666
testRuntime("org.synchronoss.cloud:nio-multipart-parser:1.1.0")

‎spring-webmvc/spring-webmvc.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ dependencies {
5353
exclude group: "org.springframework", module: "spring-web"
5454
}
5555
optional('org.webjars:webjars-locator:0.32-1')
56-
optional("org.jetbrains.kotlin:kotlin-reflect")
57-
optional("org.jetbrains.kotlin:kotlin-stdlib")
56+
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
57+
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
5858
optional("org.reactivestreams:reactive-streams")
5959
testCompile("javax.servlet:javax.servlet-api:4.0.0")
6060
testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
@@ -83,9 +83,9 @@ dependencies {
8383
testCompile("io.reactivex:rxjava:${rxjavaVersion}")
8484
testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")
8585
testCompile("io.reactivex.rxjava2:rxjava:${rxjava2Version}")
86-
testCompile("org.jetbrains.kotlin:kotlin-script-runtime")
87-
testRuntime("org.jetbrains.kotlin:kotlin-script-util")
88-
testRuntime("org.jetbrains.kotlin:kotlin-compiler")
86+
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
87+
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
88+
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")
8989
testRuntime("org.jruby:jruby:9.1.12.0")
9090
testRuntime("org.python:jython-standalone:2.7.1")
9191
testRuntime("org.webjars:underscorejs:1.8.3")

0 commit comments

Comments
 (0)