Skip to content

Commit e120757

Browse files
committed
Add Netty version property to build.gradle
Issue: SPR-12381
1 parent 7de0a70 commit e120757

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ configure(allprojects) { project ->
4343
ext.jettyVersion = "9.2.3.v20140905"
4444
ext.jodaVersion = "2.5"
4545
ext.junitVersion = "4.11"
46+
ext.nettyVersion = "4.0.23.Final"
4647
ext.openJpaVersion = "2.2.2" // 2.3.0 not Java 8 compatible (based on ASM 4)
4748
ext.protobufVersion = "2.6.0"
4849
ext.reactorVersion = "1.1.5.RELEASE"
@@ -477,7 +478,9 @@ project("spring-messaging") {
477478
compile(project(":spring-core"))
478479
compile(project(":spring-context"))
479480
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+
}
481484
optional("org.eclipse.jetty.websocket:websocket-server:${jettyVersion}") {
482485
exclude group: "javax.servlet", module: "javax.servlet-api"
483486
}
@@ -499,6 +502,7 @@ project("spring-messaging") {
499502
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
500503
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
501504
testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}")
505+
testCompile("io.netty:netty-all:${nettyVersion}")
502506
testCompile("commons-dbcp:commons-dbcp:1.4")
503507
testCompile("log4j:log4j:1.2.17")
504508
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
@@ -672,7 +676,7 @@ project("spring-web") {
672676
optional("commons-fileupload:commons-fileupload:1.3.1")
673677
optional("org.apache.httpcomponents:httpclient:4.3.5")
674678
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}")
676680
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
677681
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
678682
optional("com.google.code.gson:gson:${gsonVersion}")

0 commit comments

Comments
 (0)