liangqi
/
spring-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use Kotlin BOM

Browse Source 
Close gh-23316
master
Sebastien Deleuze 5 years ago
parent 8db73c80e2
commit 095fd5bcb3
11 changed files with 26 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      build.gradle
  2. 4
      spring-beans/spring-beans.gradle
  3. 4
      spring-context/spring-context.gradle
  4. 4
      spring-core-coroutines/spring-core-coroutines.gradle
  5. 4
      spring-core/spring-core.gradle
  6. 4
      spring-jdbc/spring-jdbc.gradle
  7. 4
      spring-messaging/spring-messaging.gradle
  8. 4
      spring-test/spring-test.gradle
  9. 6
      spring-web/spring-web.gradle
  10. 8
      spring-webflux/spring-webflux.gradle
  11. 8
      spring-webmvc/spring-webmvc.gradle

1
build.gradle
Unescape View File

@ -78,6 +78,7 @@ configure(allprojects) { project ->
} }
imports { imports {
mavenBom "org.junit:junit-bom:${junit5Version}" mavenBom "org.junit:junit-bom:${junit5Version}"
mavenBom "org.jetbrains.kotlin:kotlin-bom:${kotlinVersion}"
} }
} }

4
spring-beans/spring-beans.gradle
Unescape View File

@ -7,8 +7,8 @@ dependencies {
optional("javax.inject:javax.inject:1") optional("javax.inject:javax.inject:1")
optional("org.yaml:snakeyaml:1.24") optional("org.yaml:snakeyaml:1.24")
optional("org.codehaus.groovy:groovy-xml:${groovyVersion}") optional("org.codehaus.groovy:groovy-xml:${groovyVersion}")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-stdlib")
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
} }

4
spring-context/spring-context.gradle
Unescape View File

@ -27,8 +27,8 @@ dependencies {
optional("org.beanshell:bsh:2.0b5") optional("org.beanshell:bsh:2.0b5")
optional("joda-time:joda-time:2.10.1") optional("joda-time:joda-time:2.10.1")
optional("org.hibernate:hibernate-validator:5.4.3.Final") optional("org.hibernate:hibernate-validator:5.4.3.Final")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("org.reactivestreams:reactive-streams") optional("org.reactivestreams:reactive-streams")
testCompile("io.projectreactor:reactor-core") testCompile("io.projectreactor:reactor-core")
testCompile("org.codehaus.groovy:groovy-jsr223:${groovyVersion}") testCompile("org.codehaus.groovy:groovy-jsr223:${groovyVersion}")

4
spring-core-coroutines/spring-core-coroutines.gradle
Unescape View File

@ -1,8 +1,8 @@
description = "Spring Core Coroutines support" description = "Spring Core Coroutines support"
dependencies { dependencies {
compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") compile("org.jetbrains.kotlin:kotlin-reflect")
compile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") compile("org.jetbrains.kotlin:kotlin-stdlib")
compile("io.projectreactor:reactor-core") compile("io.projectreactor:reactor-core")
compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutinesVersion}") compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutinesVersion}")
compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:${coroutinesVersion}") compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:${coroutinesVersion}")

4
spring-core/spring-core.gradle
Unescape View File

@ -76,8 +76,8 @@ dependencies {
compileOnly(project(":spring-core-coroutines")) compileOnly(project(":spring-core-coroutines"))
optional("net.sf.jopt-simple:jopt-simple:5.0.4") optional("net.sf.jopt-simple:jopt-simple:5.0.4")
optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("io.projectreactor:reactor-core") optional("io.projectreactor:reactor-core")
optional("io.reactivex:rxjava:${rxjavaVersion}") optional("io.reactivex:rxjava:${rxjavaVersion}")
optional("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}") optional("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")

4
spring-jdbc/spring-jdbc.gradle
Unescape View File

@ -10,6 +10,6 @@ dependencies {
optional("com.h2database:h2:1.4.199") optional("com.h2database:h2:1.4.199")
optional("org.apache.derby:derby:10.14.2.0") optional("org.apache.derby:derby:10.14.2.0")
optional("org.apache.derby:derbyclient: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-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-stdlib")
} }

4
spring-messaging/spring-messaging.gradle
Unescape View File

@ -31,8 +31,8 @@ dependencies {
testCompile("org.apache.activemq:activemq-stomp:5.8.0") testCompile("org.apache.activemq:activemq-stomp:5.8.0")
testCompile("io.projectreactor:reactor-test") testCompile("io.projectreactor:reactor-test")
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}" testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-reflect")
testCompile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-stdlib")
testCompile("org.xmlunit:xmlunit-assertj:2.6.2") testCompile("org.xmlunit:xmlunit-assertj:2.6.2")
testCompile("org.xmlunit:xmlunit-matchers:2.6.2") testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
testCompile(project(":spring-core-coroutines")) testCompile(project(":spring-core-coroutines"))

4
spring-test/spring-test.gradle
Unescape View File

@ -50,8 +50,8 @@ dependencies {
optional("org.xmlunit:xmlunit-matchers:2.6.2") optional("org.xmlunit:xmlunit-matchers:2.6.2")
optional("org.skyscreamer:jsonassert:1.5.0") optional("org.skyscreamer:jsonassert:1.5.0")
optional("com.jayway.jsonpath:json-path:2.4.0") optional("com.jayway.jsonpath:json-path:2.4.0")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("io.projectreactor:reactor-test") optional("io.projectreactor:reactor-test")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutinesVersion}") optional("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutinesVersion}")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:${coroutinesVersion}") optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:${coroutinesVersion}")

6
spring-web/spring-web.gradle
Unescape View File

@ -61,8 +61,8 @@ dependencies {
optional("com.rometools:rome:1.12.0") optional("com.rometools:rome:1.12.0")
optional("com.caucho:hessian:4.0.51") optional("com.caucho:hessian:4.0.51")
optional("org.codehaus.groovy:groovy:${groovyVersion}") optional("org.codehaus.groovy:groovy:${groovyVersion}")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-stdlib")
testCompile("io.projectreactor:reactor-test") testCompile("io.projectreactor:reactor-test")
testCompile("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") { testCompile("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
exclude group: "org.apache.taglibs", module: "taglibs-standard-spec" 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-server")
testCompile("org.eclipse.jetty:jetty-servlet") testCompile("org.eclipse.jetty:jetty-servlet")
testCompile("com.squareup.okhttp3:mockwebserver:3.14.2") 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.skyscreamer:jsonassert:1.5.0")
testCompile("org.xmlunit:xmlunit-matchers:2.6.2") testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
testCompile("org.xmlunit:xmlunit-assertj:2.6.2") testCompile("org.xmlunit:xmlunit-assertj:2.6.2")

8
spring-webflux/spring-webflux.gradle
Unescape View File

@ -38,8 +38,8 @@ dependencies {
optional("org.apache.httpcomponents:httpclient:4.5.9") { optional("org.apache.httpcomponents:httpclient:4.5.9") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("com.google.protobuf:protobuf-java-util:3.7.1") optional("com.google.protobuf:protobuf-java-util:3.7.1")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutinesVersion}") optional("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutinesVersion}")
optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:${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("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3")
testCompile("com.squareup.okhttp3:mockwebserver:3.14.2") testCompile("com.squareup.okhttp3:mockwebserver:3.14.2")
testCompile(project(":spring-core-coroutines")) testCompile(project(":spring-core-coroutines"))
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-script-runtime")
testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223-embeddable:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223-embeddable")
testRuntime("org.jruby:jruby:9.2.7.0") testRuntime("org.jruby:jruby:9.2.7.0")
testRuntime("org.python:jython-standalone:2.7.1") testRuntime("org.python:jython-standalone:2.7.1")
testRuntime("org.synchronoss.cloud:nio-multipart-parser:1.1.0") testRuntime("org.synchronoss.cloud:nio-multipart-parser:1.1.0")

8
spring-webmvc/spring-webmvc.gradle
Unescape View File

@ -40,8 +40,8 @@ dependencies {
exclude group: "org.slf4j", module: "jcl-over-slf4j" exclude group: "org.slf4j", module: "jcl-over-slf4j"
} }
optional("org.codehaus.groovy:groovy-templates:${groovyVersion}") optional("org.codehaus.groovy:groovy-templates:${groovyVersion}")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-reflect")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-stdlib")
optional("org.reactivestreams:reactive-streams") optional("org.reactivestreams:reactive-streams")
testCompile("javax.servlet:javax.servlet-api:4.0.1") testCompile("javax.servlet:javax.servlet-api:4.0.1")
testCompile("org.eclipse.jetty:jetty-servlet") { testCompile("org.eclipse.jetty:jetty-servlet") {
@ -72,8 +72,8 @@ dependencies {
testCompile("io.reactivex:rxjava:${rxjavaVersion}") testCompile("io.reactivex:rxjava:${rxjavaVersion}")
testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}") testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")
testCompile("io.reactivex.rxjava2:rxjava:${rxjava2Version}") testCompile("io.reactivex.rxjava2:rxjava:${rxjava2Version}")
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-script-runtime")
testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223-embeddable:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223-embeddable")
testRuntime("org.jruby:jruby:9.2.7.0") testRuntime("org.jruby:jruby:9.2.7.0")
testRuntime("org.python:jython-standalone:2.7.1") testRuntime("org.python:jython-standalone:2.7.1")
testRuntime("org.webjars:underscorejs:1.8.3") testRuntime("org.webjars:underscorejs:1.8.3")

Write Preview
Loading…
Cancel
Save