root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Leverage Kotlin plugin dependency management

This commit is contained in:
Sebastien Deleuze 2017-08-22 17:35:57 +02:00
parent ef68ccdbd8
commit 3e2f6c848a
10 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -54,7 +54,6 @@ configure(allprojects) { project ->
ext.junitJupiterVersion = '5.0.0-RC2' ext.junitJupiterVersion = '5.0.0-RC2'
ext.junitPlatformVersion = '1.0.0-RC2' ext.junitPlatformVersion = '1.0.0-RC2'
ext.junitVintageVersion = "4.12.0-RC2" ext.junitVintageVersion = "4.12.0-RC2"
ext.kotlinVersion = '1.1.4'
ext.log4jVersion = '2.8.2' ext.log4jVersion = '2.8.2'
ext.nettyVersion = "4.1.14.Final" ext.nettyVersion = "4.1.14.Final"
ext.okhttp3Version = "3.8.1" ext.okhttp3Version = "3.8.1"

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

@ -5,8 +5,8 @@ apply plugin: "groovy"
dependencies { dependencies {
compile(project(':spring-core')) compile(project(':spring-core'))
optional("javax.inject:javax.inject:1") optional("javax.inject:javax.inject:1")
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.yaml:snakeyaml:1.18") optional("org.yaml:snakeyaml:1.18")
optional("org.codehaus.groovy:groovy-all:${groovyVersion}") optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")

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

@ -21,8 +21,8 @@ dependencies {
optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("org.codehaus.groovy:groovy-all:${groovyVersion}") optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
optional("org.beanshell:bsh:2.0b5") optional("org.beanshell:bsh:2.0b5")
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.commons:commons-pool2:2.4.2") testCompile("org.apache.commons:commons-pool2:2.4.2")
testCompile("org.slf4j:slf4j-api:${slf4jVersion}") testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
testCompile("javax.inject:javax.inject-tck:1") testCompile("javax.inject:javax.inject-tck:1")

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

@ -78,8 +78,8 @@ dependencies {
compile(project(":spring-jcl")) compile(project(":spring-jcl"))
optional("net.sf.jopt-simple:jopt-simple:5.0.3") optional("net.sf.jopt-simple:jopt-simple:5.0.3")
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
View File

@ -10,6 +10,6 @@ dependencies {
optional("com.h2database:h2:1.4.196") optional("com.h2database:h2:1.4.196")
optional("org.apache.derby:derby:10.13.1.1") optional("org.apache.derby:derby:10.13.1.1")
optional("org.apache.derby:derbyclient:10.13.1.1") optional("org.apache.derby:derbyclient:10.13.1.1")
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
View File

@ -39,8 +39,8 @@ dependencies {
} }
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}") testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
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")
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}") testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}") testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
testRuntime("javax.activation:activation:${activationVersion}") testRuntime("javax.activation:activation:${activationVersion}")

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

@ -52,8 +52,8 @@ dependencies {
optional("org.xmlunit:xmlunit-matchers:2.3.0") optional("org.xmlunit:xmlunit-matchers:2.3.0")
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")
testCompile(project(":spring-context-support")) testCompile(project(":spring-context-support"))
testCompile(project(":spring-oxm")) testCompile(project(":spring-oxm"))

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

@ -65,8 +65,8 @@ dependencies {
optional("javax.xml.bind:jaxb-api:${jaxbVersion}") optional("javax.xml.bind:jaxb-api:${jaxbVersion}")
optional("javax.xml.ws:jaxws-api:${jaxwsVersion}") optional("javax.xml.ws:jaxws-api:${jaxwsVersion}")
optional("javax.mail:javax.mail-api:${javamailVersion}") optional("javax.mail:javax.mail-api:${javamailVersion}")
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.1") { testCompile("org.apache.taglibs:taglibs-standard-jstlel:1.2.1") {
exclude group: "org.apache.taglibs", module: "taglibs-standard-spec" exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
@ -82,7 +82,7 @@ dependencies {
exclude group: 'io.reactivex', module: 'rxjava' exclude group: 'io.reactivex', module: 'rxjava'
} }
testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}") testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
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")
testRuntime("com.sun.mail:javax.mail:${javamailVersion}") testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}") testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")

10
spring-webflux/spring-webflux.gradle
View File

@ -42,8 +42,8 @@ dependencies {
optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") { optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") {
exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec" exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec"
} }
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("javax.xml.bind:jaxb-api:${jaxbVersion}") testCompile("javax.xml.bind:jaxb-api:${jaxbVersion}")
testCompile("io.projectreactor:reactor-test") testCompile("io.projectreactor:reactor-test")
testCompile("org.hibernate:hibernate-validator:6.0.1.Final") testCompile("org.hibernate:hibernate-validator:6.0.1.Final")
@ -58,9 +58,9 @@ dependencies {
} }
testCompile("com.fasterxml:aalto-xml:1.0.0") testCompile("com.fasterxml:aalto-xml:1.0.0")
testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}") testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-script-runtime")
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util")
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-compiler")
testRuntime("org.jruby:jruby:9.1.12.0") testRuntime("org.jruby:jruby:9.1.12.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")

10
spring-webmvc/spring-webmvc.gradle
View File

@ -53,8 +53,8 @@ dependencies {
exclude group: "org.springframework", module: "spring-web" exclude group: "org.springframework", module: "spring-web"
} }
optional('org.webjars:webjars-locator:0.32-1') optional('org.webjars:webjars-locator:0.32-1')
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.0") testCompile("javax.servlet:javax.servlet-api:4.0.0")
testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}") { testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
@ -83,9 +83,9 @@ 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-script-util:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util")
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-compiler")
testRuntime("org.jruby:jruby:9.1.12.0") testRuntime("org.jruby:jruby:9.1.12.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")