@@ -43,6 +43,7 @@ configure(allprojects) { project ->
43
43
ext. jettyVersion = " 9.2.3.v20140905"
44
44
ext. jodaVersion = " 2.5"
45
45
ext. junitVersion = " 4.11"
46
+ ext. nettyVersion = " 4.0.23.Final"
46
47
ext. openJpaVersion = " 2.2.2" // 2.3.0 not Java 8 compatible (based on ASM 4)
47
48
ext. protobufVersion = " 2.6.0"
48
49
ext. reactorVersion = " 1.1.5.RELEASE"
@@ -477,7 +478,9 @@ project("spring-messaging") {
477
478
compile(project(" :spring-core" ))
478
479
compile(project(" :spring-context" ))
479
480
optional(" org.projectreactor:reactor-core:${ reactorVersion} " )
480
- optional(" org.projectreactor:reactor-net:${ reactorVersion} " )
481
+ optional(" org.projectreactor:reactor-net:${ reactorVersion} " ) {
482
+ exclude group : " io.netty" , module : " netty-all"
483
+ }
481
484
optional(" org.eclipse.jetty.websocket:websocket-server:${ jettyVersion} " ) {
482
485
exclude group : " javax.servlet" , module : " javax.servlet-api"
483
486
}
@@ -499,6 +502,7 @@ project("spring-messaging") {
499
502
testCompile(" org.apache.tomcat.embed:tomcat-embed-core:${ tomcatVersion} " )
500
503
testCompile(" org.apache.tomcat.embed:tomcat-embed-websocket:${ tomcatVersion} " )
501
504
testCompile(" org.apache.tomcat.embed:tomcat-embed-logging-juli:${ tomcatVersion} " )
505
+ testCompile(" io.netty:netty-all:${ nettyVersion} " )
502
506
testCompile(" commons-dbcp:commons-dbcp:1.4" )
503
507
testCompile(" log4j:log4j:1.2.17" )
504
508
testCompile(" org.slf4j:slf4j-jcl:${ slf4jVersion} " )
@@ -672,7 +676,7 @@ project("spring-web") {
672
676
optional(" commons-fileupload:commons-fileupload:1.3.1" )
673
677
optional(" org.apache.httpcomponents:httpclient:4.3.5" )
674
678
optional(" org.apache.httpcomponents:httpasyncclient:4.0.2" )
675
- optional(" io.netty:netty-all:4.0.23.Final " )
679
+ optional(" io.netty:netty-all:${ nettyVersion } " )
676
680
optional(" com.fasterxml.jackson.core:jackson-databind:${ jackson2Version} " )
677
681
optional(" com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${ jackson2Version} " )
678
682
optional(" com.google.code.gson:gson:${ gsonVersion} " )
0 commit comments