Skip to content

Commit 3d6a5bc

Browse files
committed
Switch to latest published versions of Reactor and RxNetty
1 parent 7ff9f0a commit 3d6a5bc

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

build.gradle

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ configure(allprojects) { project ->
7474
ext.protobufVersion = "3.0.0-beta-4"
7575
ext.reactivestreamsVersion = "1.0.0"
7676
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'
7979
ext.romeVersion = "1.6.0"
8080
ext.rxjavaVersion = '1.1.8'
81-
ext.rxnettyVersion = '0.5.2-SNAPSHOT'
81+
ext.rxnettyVersion = '0.5.2-rc.3'
8282
ext.servletVersion = "3.1.0"
8383
ext.slf4jVersion = "1.7.21"
8484
ext.snakeyamlVersion = "1.17"
@@ -159,8 +159,6 @@ configure(allprojects) { project ->
159159
repositories {
160160
maven { url "https://repo.spring.io/libs-release" }
161161
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
164162
}
165163

166164
dependencies {
@@ -383,12 +381,12 @@ project("spring-core") {
383381
optional("io.projectreactor:reactor-core:${reactorCoreVersion}")
384382
optional "io.reactivex:rxjava:${rxjavaVersion}"
385383
optional("io.netty:netty-buffer:${nettyVersion}")
384+
testCompile("javax.xml.bind:jaxb-api:${jaxbVersion}")
386385
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
387386
testCompile("org.xmlunit:xmlunit-matchers:${xmlunitVersion}")
388387
testCompile("com.fasterxml.woodstox:woodstox-core:${woodstoxVersion}") {
389388
exclude group: "stax", module: "stax-api"
390389
}
391-
testCompile("javax.xml.bind:jaxb-api:${jaxbVersion}")
392390
}
393391

394392
jar {
@@ -534,11 +532,11 @@ project("spring-oxm") {
534532
}
535533
optional("org.jibx:jibx-run:1.2.6")
536534
testCompile(project(":spring-context"))
537-
testCompile("org.xmlunit:xmlunit-matchers:${xmlunitVersion}")
538535
testCompile("xpp3:xpp3:1.1.4c")
539536
testCompile("org.codehaus.jettison:jettison:1.3.7") {
540537
exclude group: 'stax', module: 'stax-api'
541538
}
539+
testCompile("org.xmlunit:xmlunit-matchers:${xmlunitVersion}")
542540
testCompile(files(genCastor.classesDir).builtBy(genCastor))
543541
testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
544542
testRuntime("xerces:xercesImpl:2.11.0") // for Castor
@@ -583,11 +581,11 @@ project("spring-messaging") {
583581
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
584582
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
585583
testCompile("io.netty:netty-all:${nettyVersion}")
586-
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
587584
testCompile("org.xmlunit:xmlunit-matchers:${xmlunitVersion}")
585+
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
586+
testRuntime("javax.activation:activation:${activationApiVersion}")
588587
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
589588
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
590-
testRuntime("javax.activation:activation:${activationApiVersion}")
591589
}
592590
}
593591

@@ -715,6 +713,7 @@ project("spring-web") {
715713
}
716714
optional("io.reactivex:rxjava:${rxjavaVersion}")
717715
optional("io.undertow:undertow-core:${undertowVersion}")
716+
optional("org.jboss.xnio:xnio-api:3.3.7.Final")
718717
optional("io.netty:netty-buffer:${nettyVersion}") // Temporarily for JsonObjectDecoder
719718
optional("com.fasterxml.woodstox:woodstox-core:${woodstoxVersion}") { // woodstox before aalto
720719
exclude group: "stax", module: "stax-api"
@@ -742,22 +741,24 @@ project("spring-web") {
742741
optional("javax.xml.ws:jaxws-api:${jaxwsVersion}")
743742
optional("javax.mail:javax.mail-api:${javamailVersion}")
744743
testCompile(project(":spring-context-support")) // for JafMediaTypeFactory
745-
testCompile("org.xmlunit:xmlunit-matchers:${xmlunitVersion}")
746-
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
747744
testCompile("org.apache.taglibs:taglibs-standard-jstlel:1.2.1") {
748745
exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
749746
}
750747
testCompile("com.fasterxml.jackson.datatype:jackson-datatype-joda:${jackson2Version}")
751748
testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2Version}")
752749
testCompile("com.fasterxml.jackson.module:jackson-module-kotlin:${jackson2Version}")
753-
testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
754750
testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}")
755751
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
756752
testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}")
757753
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}")
759758
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
760759
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")
761762
}
762763
}
763764

@@ -775,6 +776,7 @@ project("spring-web-reactive") {
775776
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
776777
optional("org.freemarker:freemarker:${freemarkerVersion}")
777778
optional "org.apache.httpcomponents:httpclient:4.5.1" // Needed to run Javadoc without error
779+
testCompile("javax.validation:validation-api:${beanvalVersion}")
778780
testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}")
779781
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
780782
testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}")
@@ -783,15 +785,17 @@ project("spring-web-reactive") {
783785
testCompile("io.reactivex:rxnetty-http:${rxnettyVersion}") {
784786
exclude group: 'io.reactivex', module: 'rxjava'
785787
}
786-
testCompile("io.undertow:undertow-core:${undertowVersion}")
787788
testCompile("io.reactivex:rxjava:${rxjavaVersion}")
789+
testCompile("io.undertow:undertow-core:${undertowVersion}")
790+
testCompile("org.jboss.xnio:xnio-api:3.3.7.Final")
788791
testCompile("com.fasterxml:aalto-xml:1.0.0")
789-
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
790-
testCompile("javax.validation:validation-api:${beanvalVersion}")
791792
testCompile("org.xmlunit:xmlunit-matchers:${xmlunitVersion}")
793+
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
792794
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
793795
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
794796
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")
795799
}
796800
}
797801

@@ -1008,8 +1012,7 @@ project("spring-test") {
10081012
testCompile("org.apache.httpcomponents:httpclient:${httpclientVersion}")
10091013
testCompile("javax.cache:cache-api:1.0.0")
10101014
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
10131016
testRuntime("org.ehcache:ehcache:${ehcache3Version}")
10141017
testRuntime("org.terracotta:management-model:2.0.0")
10151018
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")

0 commit comments

Comments
 (0)