@@ -6,13 +6,14 @@ buildscript {
66 dependencies {
77 classpath(" org.springframework.build.gradle:propdeps-plugin:0.0.7" )
88 classpath(" org.asciidoctor:asciidoctor-gradle-plugin:1.5.3" )
9- classpath " org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.6"
9+ classpath( " org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.6" )
1010 classpath(" io.spring.gradle:docbook-reference-plugin:0.3.1" )
1111 }
1212}
1313
1414plugins {
1515 id " org.sonarqube" version " 2.2.1"
16+ id " io.spring.dependency-management" version " 1.0.0.RC2"
1617}
1718
1819ext {
@@ -78,9 +79,7 @@ configure(allprojects) { project ->
7879 ext. poiVersion = " 3.15"
7980 ext. protobufVersion = " 3.1.0"
8081 ext. quartzVersion = " 2.2.3"
81- ext. reactivestreamsVersion = " 1.0.0"
82- ext. reactorCoreVersion = ' 3.0.4.RELEASE'
83- ext. reactorNettyVersion = ' 0.6.0.RELEASE'
82+ ext. reactorVersion = " Aluminium-RELEASE"
8483 ext. romeVersion = " 1.7.0"
8584 ext. rxjavaVersion = ' 1.2.5'
8685 ext. rxjavaAdapterVersion = ' 1.2.1'
@@ -132,11 +131,6 @@ configure(allprojects) { project ->
132131 details. useVersion nettyVersion
133132 }
134133 }
135- resolutionStrategy. eachDependency { DependencyResolveDetails details ->
136- if (details. requested. name == ' reactor-core' && details. requested. version. startsWith(' 3.' )) {
137- details. useVersion reactorCoreVersion
138- }
139- }
140134 }
141135
142136 compileJava. options* . compilerArgs = [
@@ -180,11 +174,21 @@ configure(allprojects) { project ->
180174 }
181175
182176 repositories {
177+ maven { url " https://repo.spring.io/libs-snapshot" }
183178 maven { url " https://repo.spring.io/libs-release" }
184179 maven { url " https://repo.spring.io/milestone" }
185180 maven { url " http://dl.bintray.com/kotlin/kotlin-eap-1.1" }
186181 }
187182
183+ dependencyManagement {
184+ imports {
185+ mavenBom " io.projectreactor:reactor-bom:${ reactorVersion} "
186+ }
187+ resolutionStrategy {
188+ cacheChangingModulesFor 0 , ' seconds'
189+ }
190+ }
191+
188192 dependencies {
189193 testCompile(" junit:junit:${ junitVersion} " ) {
190194 exclude group :' org.hamcrest' , module :' hamcrest-core'
@@ -263,7 +267,6 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
263267 configurations {
264268 jacoco
265269 }
266-
267270 dependencies {
268271 jacoco(" org.jacoco:org.jacoco.agent:0.7.5.201505241946:runtime" )
269272 }
@@ -403,13 +406,13 @@ project("spring-core") {
403406 optional(" org.aspectj:aspectjweaver:${ aspectjVersion} " )
404407 optional(" org.jetbrains.kotlin:kotlin-reflect:${ kotlinVersion} " )
405408 optional(" org.jetbrains.kotlin:kotlin-stdlib:${ kotlinVersion} " )
406- optional(" org.reactivestreams:reactive-streams: ${ reactivestreamsVersion } " )
407- optional(" io.projectreactor:reactor-core: ${ reactorCoreVersion } " )
409+ optional(" org.reactivestreams:reactive-streams" )
410+ optional(" io.projectreactor:reactor-core" )
408411 optional " io.reactivex:rxjava:${ rxjavaVersion} "
409412 optional " io.reactivex.rxjava2:rxjava:${ rxjava2Version} "
410413 optional " io.reactivex:rxjava-reactive-streams:${ rxjavaAdapterVersion} "
411414 optional(" io.netty:netty-buffer:${ nettyVersion} " )
412- testCompile(" io.projectreactor.addons:reactor-test: ${ reactorCoreVersion } " )
415+ testCompile(" io.projectreactor.addons:reactor-test" )
413416 testCompile(" javax.xml.bind:jaxb-api:${ jaxbVersion} " )
414417 testCompile(" org.apache.tomcat.embed:tomcat-embed-core:${ tomcatVersion} " )
415418 testCompile(" org.xmlunit:xmlunit-matchers:${ xmlunitVersion} " )
@@ -586,8 +589,8 @@ project("spring-messaging") {
586589 compile(project(" :spring-core" ))
587590 compile(project(" :spring-context" ))
588591 optional(project(" :spring-oxm" ))
589- optional(" io.projectreactor:reactor-core: ${ reactorCoreVersion } " )
590- optional(" io.projectreactor.ipc:reactor-netty: ${ reactorNettyVersion } " )
592+ optional(" io.projectreactor:reactor-core" )
593+ optional(" io.projectreactor.ipc:reactor-netty" )
591594 optional(" io.netty:netty-all:${ nettyVersion} " )
592595 optional(" org.eclipse.jetty.websocket:websocket-server:${ jettyVersion} " ) {
593596 exclude group : " javax.servlet" , module : " javax.servlet-api"
@@ -738,9 +741,9 @@ project("spring-web") {
738741 optional(" org.codehaus.groovy:groovy-all:${ groovyVersion} " )
739742 optional(" com.caucho:hessian:4.0.38" )
740743 optional(" commons-fileupload:commons-fileupload:${ fileuploadVersion} " )
741- optional(" org.reactivestreams:reactive-streams: ${ reactivestreamsVersion } " )
742- optional(" io.projectreactor:reactor-core: ${ reactorCoreVersion } " )
743- optional(" io.projectreactor.ipc:reactor-netty: ${ reactorNettyVersion } " )
744+ optional(" org.reactivestreams:reactive-streams" )
745+ optional(" io.projectreactor:reactor-core" )
746+ optional(" io.projectreactor.ipc:reactor-netty" )
744747 optional(" io.reactivex:rxnetty-http:${ rxnettyVersion} " ) {
745748 exclude group : ' io.reactivex' , module : ' rxjava'
746749 }
@@ -779,7 +782,7 @@ project("spring-web") {
779782 optional(" javax.mail:javax.mail-api:${ javamailVersion} " )
780783 optional(" org.jetbrains.kotlin:kotlin-stdlib:${ kotlinVersion} " )
781784 testCompile(project(" :spring-context-support" )) // for JafMediaTypeFactory
782- testCompile(" io.projectreactor.addons:reactor-test: ${ reactorCoreVersion } " )
785+ testCompile(" io.projectreactor.addons:reactor-test" )
783786 testCompile(" org.apache.taglibs:taglibs-standard-jstlel:1.2.1" ) {
784787 exclude group : " org.apache.taglibs" , module : " taglibs-standard-spec"
785788 }
@@ -813,16 +816,16 @@ project("spring-web-reactive") {
813816 dependencies {
814817 compile(project(" :spring-core" ))
815818 compile(project(" :spring-web" ))
816- compile " org.reactivestreams:reactive-streams: ${ reactivestreamsVersion } "
817- compile " io.projectreactor:reactor-core: ${ reactorCoreVersion } "
819+ compile " org.reactivestreams:reactive-streams"
820+ compile " io.projectreactor:reactor-core"
818821 optional(project(" :spring-context-support" )) // for FreeMarker support
819822 provided " javax.servlet:javax.servlet-api:${ servletVersion} "
820823 optional(" javax.xml.bind:jaxb-api:${ jaxbVersion} " )
821824 optional(" com.fasterxml.jackson.core:jackson-databind:${ jackson2Version} " )
822825 optional(" org.freemarker:freemarker:${ freemarkerVersion} " )
823826 optional " org.apache.httpcomponents:httpclient:${ httpclientVersion} "
824827 optional(' org.webjars:webjars-locator:0.32' )
825- optional(" io.projectreactor.ipc:reactor-netty: ${ reactorNettyVersion } " )
828+ optional(" io.projectreactor.ipc:reactor-netty" )
826829 optional(" io.reactivex:rxnetty-http:${ rxnettyVersion} " ) {
827830 exclude group : ' io.reactivex' , module : ' rxjava'
828831 }
@@ -841,7 +844,7 @@ project("spring-web-reactive") {
841844 }
842845 optional(" org.jetbrains.kotlin:kotlin-reflect:${ kotlinVersion} " )
843846 optional(" org.jetbrains.kotlin:kotlin-stdlib:${ kotlinVersion} " )
844- testCompile(" io.projectreactor.addons:reactor-test: ${ reactorCoreVersion } " )
847+ testCompile(" io.projectreactor.addons:reactor-test" )
845848 testCompile(" javax.validation:validation-api:${ beanvalVersion} " )
846849 testCompile(" org.hibernate:hibernate-validator:${ hibval5Version} " )
847850 testCompile(" org.apache.tomcat:tomcat-util:${ tomcatVersion} " )
@@ -1025,8 +1028,8 @@ project("spring-websocket") {
10251028 optional(" com.fasterxml.jackson.core:jackson-databind:${ jackson2Version} " )
10261029 testCompile(" org.apache.tomcat.embed:tomcat-embed-core:${ tomcatVersion} " )
10271030 testCompile(" org.apache.tomcat.embed:tomcat-embed-websocket:${ tomcatVersion} " )
1028- testCompile(" io.projectreactor:reactor-core: ${ reactorCoreVersion } " )
1029- testCompile(" io.projectreactor.ipc:reactor-netty: ${ reactorNettyVersion } " )
1031+ testCompile(" io.projectreactor:reactor-core" )
1032+ testCompile(" io.projectreactor.ipc:reactor-netty" )
10301033 testCompile(" io.netty:netty-all:${ nettyVersion} " )
10311034 testCompile(" org.slf4j:slf4j-jcl:${ slf4jVersion} " )
10321035 testRuntime(" org.jboss.xnio:xnio-nio:${ xnioVersion} " )
@@ -1077,8 +1080,8 @@ project("spring-test") {
10771080 }
10781081 optional(" org.skyscreamer:jsonassert:1.4.0" )
10791082 optional(" com.jayway.jsonpath:json-path:2.2.0" )
1080- optional(" org.reactivestreams:reactive-streams: ${ reactivestreamsVersion } " )
1081- optional(" io.projectreactor:reactor-core: ${ reactorCoreVersion } " )
1083+ optional(" org.reactivestreams:reactive-streams" )
1084+ optional(" io.projectreactor:reactor-core" )
10821085 testCompile(project(" :spring-context-support" ))
10831086 testCompile(project(" :spring-oxm" ))
10841087 testCompile(" javax.mail:javax.mail-api:${ javamailVersion} " )
0 commit comments