@@ -74,11 +74,11 @@ configure(allprojects) { project ->
74
74
ext. protobufVersion = " 3.0.0-beta-4"
75
75
ext. reactivestreamsVersion = " 1.0.0"
76
76
ext. reactorVersion = " 2.0.8.RELEASE"
77
- ext. reactorCoreVersion = ' 3.0.0.BUILD-SNAPSHOT '
78
- ext. reactorNettyVersion = ' 0.5.0.BUILD-SNAPSHOT '
77
+ ext. reactorCoreVersion = ' 3.0.0.RC1 '
78
+ ext. reactorNettyVersion = ' 0.5.0.M2 '
79
79
ext. romeVersion = " 1.6.0"
80
80
ext. rxjavaVersion = ' 1.1.8'
81
- ext. rxnettyVersion = ' 0.5.2-SNAPSHOT '
81
+ ext. rxnettyVersion = ' 0.5.2-rc.3 '
82
82
ext. servletVersion = " 3.1.0"
83
83
ext. slf4jVersion = " 1.7.21"
84
84
ext. snakeyamlVersion = " 1.17"
@@ -159,8 +159,6 @@ configure(allprojects) { project ->
159
159
repositories {
160
160
maven { url " https://repo.spring.io/libs-release" }
161
161
maven { url " https://repo.spring.io/milestone" }
162
- maven { url ' http://repo.spring.io/snapshot' } // Reactor snapshots
163
- maven { url ' https://oss.jfrog.org/libs-snapshot' } // RxNetty 0.5.x snapshots
164
162
}
165
163
166
164
dependencies {
@@ -383,12 +381,12 @@ project("spring-core") {
383
381
optional(" io.projectreactor:reactor-core:${ reactorCoreVersion} " )
384
382
optional " io.reactivex:rxjava:${ rxjavaVersion} "
385
383
optional(" io.netty:netty-buffer:${ nettyVersion} " )
384
+ testCompile(" javax.xml.bind:jaxb-api:${ jaxbVersion} " )
386
385
testCompile(" org.apache.tomcat.embed:tomcat-embed-core:${ tomcatVersion} " )
387
386
testCompile(" org.xmlunit:xmlunit-matchers:${ xmlunitVersion} " )
388
387
testCompile(" com.fasterxml.woodstox:woodstox-core:${ woodstoxVersion} " ) {
389
388
exclude group : " stax" , module : " stax-api"
390
389
}
391
- testCompile(" javax.xml.bind:jaxb-api:${ jaxbVersion} " )
392
390
}
393
391
394
392
jar {
@@ -534,11 +532,11 @@ project("spring-oxm") {
534
532
}
535
533
optional(" org.jibx:jibx-run:1.2.6" )
536
534
testCompile(project(" :spring-context" ))
537
- testCompile(" org.xmlunit:xmlunit-matchers:${ xmlunitVersion} " )
538
535
testCompile(" xpp3:xpp3:1.1.4c" )
539
536
testCompile(" org.codehaus.jettison:jettison:1.3.7" ) {
540
537
exclude group : ' stax' , module : ' stax-api'
541
538
}
539
+ testCompile(" org.xmlunit:xmlunit-matchers:${ xmlunitVersion} " )
542
540
testCompile(files(genCastor. classesDir). builtBy(genCastor))
543
541
testCompile(files(genJaxb. classesDir). builtBy(genJaxb))
544
542
testRuntime(" xerces:xercesImpl:2.11.0" ) // for Castor
@@ -583,11 +581,11 @@ project("spring-messaging") {
583
581
testCompile(" org.apache.tomcat.embed:tomcat-embed-core:${ tomcatVersion} " )
584
582
testCompile(" org.apache.tomcat.embed:tomcat-embed-websocket:${ tomcatVersion} " )
585
583
testCompile(" io.netty:netty-all:${ nettyVersion} " )
586
- testCompile(" org.slf4j:slf4j-jcl:${ slf4jVersion} " )
587
584
testCompile(" org.xmlunit:xmlunit-matchers:${ xmlunitVersion} " )
585
+ testCompile(" org.slf4j:slf4j-jcl:${ slf4jVersion} " )
586
+ testRuntime(" javax.activation:activation:${ activationApiVersion} " )
588
587
testRuntime(" com.sun.xml.bind:jaxb-core:${ jaxbVersion} " )
589
588
testRuntime(" com.sun.xml.bind:jaxb-impl:${ jaxbVersion} " )
590
- testRuntime(" javax.activation:activation:${ activationApiVersion} " )
591
589
}
592
590
}
593
591
@@ -715,6 +713,7 @@ project("spring-web") {
715
713
}
716
714
optional(" io.reactivex:rxjava:${ rxjavaVersion} " )
717
715
optional(" io.undertow:undertow-core:${ undertowVersion} " )
716
+ optional(" org.jboss.xnio:xnio-api:3.3.7.Final" )
718
717
optional(" io.netty:netty-buffer:${ nettyVersion} " ) // Temporarily for JsonObjectDecoder
719
718
optional(" com.fasterxml.woodstox:woodstox-core:${ woodstoxVersion} " ) { // woodstox before aalto
720
719
exclude group : " stax" , module : " stax-api"
@@ -742,22 +741,24 @@ project("spring-web") {
742
741
optional(" javax.xml.ws:jaxws-api:${ jaxwsVersion} " )
743
742
optional(" javax.mail:javax.mail-api:${ javamailVersion} " )
744
743
testCompile(project(" :spring-context-support" )) // for JafMediaTypeFactory
745
- testCompile(" org.xmlunit:xmlunit-matchers:${ xmlunitVersion} " )
746
- testCompile(" org.slf4j:slf4j-jcl:${ slf4jVersion} " )
747
744
testCompile(" org.apache.taglibs:taglibs-standard-jstlel:1.2.1" ) {
748
745
exclude group : " org.apache.taglibs" , module : " taglibs-standard-spec"
749
746
}
750
747
testCompile(" com.fasterxml.jackson.datatype:jackson-datatype-joda:${ jackson2Version} " )
751
748
testCompile(" com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${ jackson2Version} " )
752
749
testCompile(" com.fasterxml.jackson.module:jackson-module-kotlin:${ jackson2Version} " )
753
- testRuntime(" com.sun.mail:javax.mail:${ javamailVersion} " )
754
750
testCompile(" org.apache.tomcat:tomcat-util:${ tomcatVersion} " )
755
751
testCompile(" org.apache.tomcat.embed:tomcat-embed-core:${ tomcatVersion} " )
756
752
testCompile(" org.eclipse.jetty:jetty-server:${ jettyVersion} " )
757
753
testCompile(" org.eclipse.jetty:jetty-servlet:${ jettyVersion} " )
758
- testCompile(" com.squareup.okhttp3:mockwebserver:3.0.1" )
754
+ testCompile(" com.squareup.okhttp3:mockwebserver:${ okhttp3Version} " )
755
+ testCompile(" org.xmlunit:xmlunit-matchers:${ xmlunitVersion} " )
756
+ testCompile(" org.slf4j:slf4j-jcl:${ slf4jVersion} " )
757
+ testRuntime(" com.sun.mail:javax.mail:${ javamailVersion} " )
759
758
testRuntime(" com.sun.xml.bind:jaxb-core:${ jaxbVersion} " )
760
759
testRuntime(" com.sun.xml.bind:jaxb-impl:${ jaxbVersion} " )
760
+ testRuntime(" org.jboss.xnio:xnio-nio:3.3.7.Final" )
761
+ testRuntime(" org.jboss.logging:jboss-logging:3.3.0.Final" )
761
762
}
762
763
}
763
764
@@ -775,6 +776,7 @@ project("spring-web-reactive") {
775
776
optional(" com.fasterxml.jackson.core:jackson-databind:${ jackson2Version} " )
776
777
optional(" org.freemarker:freemarker:${ freemarkerVersion} " )
777
778
optional " org.apache.httpcomponents:httpclient:4.5.1" // Needed to run Javadoc without error
779
+ testCompile(" javax.validation:validation-api:${ beanvalVersion} " )
778
780
testCompile(" org.apache.tomcat:tomcat-util:${ tomcatVersion} " )
779
781
testCompile(" org.apache.tomcat.embed:tomcat-embed-core:${ tomcatVersion} " )
780
782
testCompile(" org.eclipse.jetty:jetty-server:${ jettyVersion} " )
@@ -783,15 +785,17 @@ project("spring-web-reactive") {
783
785
testCompile(" io.reactivex:rxnetty-http:${ rxnettyVersion} " ) {
784
786
exclude group : ' io.reactivex' , module : ' rxjava'
785
787
}
786
- testCompile(" io.undertow:undertow-core:${ undertowVersion} " )
787
788
testCompile(" io.reactivex:rxjava:${ rxjavaVersion} " )
789
+ testCompile(" io.undertow:undertow-core:${ undertowVersion} " )
790
+ testCompile(" org.jboss.xnio:xnio-api:3.3.7.Final" )
788
791
testCompile(" com.fasterxml:aalto-xml:1.0.0" )
789
- testCompile(" org.slf4j:slf4j-jcl:${ slf4jVersion} " )
790
- testCompile(" javax.validation:validation-api:${ beanvalVersion} " )
791
792
testCompile(" org.xmlunit:xmlunit-matchers:${ xmlunitVersion} " )
793
+ testCompile(" org.slf4j:slf4j-jcl:${ slf4jVersion} " )
792
794
testRuntime(" com.sun.xml.bind:jaxb-core:${ jaxbVersion} " )
793
795
testRuntime(" com.sun.xml.bind:jaxb-impl:${ jaxbVersion} " )
794
796
testRuntime(" javax.activation:activation:${ activationApiVersion} " )
797
+ testRuntime(" org.jboss.xnio:xnio-nio:3.3.7.Final" )
798
+ testRuntime(" org.jboss.logging:jboss-logging:3.3.0.Final" )
795
799
}
796
800
}
797
801
@@ -1008,8 +1012,7 @@ project("spring-test") {
1008
1012
testCompile(" org.apache.httpcomponents:httpclient:${ httpclientVersion} " )
1009
1013
testCompile(" javax.cache:cache-api:1.0.0" )
1010
1014
testRuntime(" org.junit.jupiter:junit-jupiter-engine:${ junitJupiterVersion} " )
1011
- // Java Util Logging for JUnit 5.
1012
- testRuntime(" org.apache.logging.log4j:log4j-jul:${ log4jVersion} " )
1015
+ testRuntime(" org.apache.logging.log4j:log4j-jul:${ log4jVersion} " ) // Java Util Logging for JUnit 5
1013
1016
testRuntime(" org.ehcache:ehcache:${ ehcache3Version} " )
1014
1017
testRuntime(" org.terracotta:management-model:2.0.0" )
1015
1018
testRuntime(" com.sun.xml.bind:jaxb-core:${ jaxbVersion} " )
0 commit comments