Skip to content

Commit 204ec6b

Browse files
eddumelendezsnicoll
authored andcommitted
Simplify Netty dependency management by importing its bom
Closes gh-1409
1 parent 6f3051c commit 204ec6b

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

build.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
220220
dependencyManagement {
221221
imports {
222222
mavenBom "io.projectreactor:reactor-bom:${reactorVersion}"
223+
mavenBom "io.netty:netty-bom:${nettyVersion}"
223224
}
224225
resolutionStrategy {
225226
cacheChangingModulesFor 0, 'seconds'
@@ -385,7 +386,7 @@ project("spring-core") {
385386
optional("io.reactivex:rxjava:${rxjavaVersion}")
386387
optional("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")
387388
optional("io.reactivex.rxjava2:rxjava:${rxjava2Version}")
388-
optional("io.netty:netty-buffer:${nettyVersion}")
389+
optional("io.netty:netty-buffer")
389390
testCompile("io.projectreactor.addons:reactor-test")
390391
testCompile("javax.xml.bind:jaxb-api:${jaxbVersion}")
391392
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
@@ -566,7 +567,7 @@ project("spring-messaging") {
566567
optional(project(":spring-oxm"))
567568
optional("io.projectreactor:reactor-core")
568569
optional("io.projectreactor.ipc:reactor-netty")
569-
optional("io.netty:netty-all:${nettyVersion}")
570+
optional("io.netty:netty-all")
570571
optional("org.eclipse.jetty.websocket:websocket-server:${jettyVersion}") {
571572
exclude group: "javax.servlet", module: "javax.servlet-api"
572573
}
@@ -587,7 +588,7 @@ project("spring-messaging") {
587588
}
588589
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
589590
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
590-
testCompile("io.netty:netty-all:${nettyVersion}")
591+
testCompile("io.netty:netty-all")
591592
testCompile("org.xmlunit:xmlunit-matchers:${xmlunitVersion}")
592593
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
593594
testCompile("org.jetbrains.kotlin:kotlin-stdlib-jre8:${kotlinVersion}")
@@ -722,7 +723,7 @@ project("spring-web") {
722723
optional("io.reactivex.rxjava2:rxjava:${rxjava2Version}")
723724
optional("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
724725
optional("io.undertow:undertow-core:${undertowVersion}")
725-
optional("io.netty:netty-buffer:${nettyVersion}") // temporarily for JsonObjectDecoder
726+
optional("io.netty:netty-buffer") // temporarily for JsonObjectDecoder
726727
optional("com.fasterxml.woodstox:woodstox-core:${woodstoxVersion}") { // woodstox before aalto
727728
exclude group: "stax", module: "stax-api"
728729
}
@@ -733,7 +734,7 @@ project("spring-web") {
733734
optional("org.apache.httpcomponents:httpasyncclient:${httpasyncVersion}") {
734735
exclude group: "commons-logging", module: "commons-logging"
735736
}
736-
optional("io.netty:netty-all:${nettyVersion}")
737+
optional("io.netty:netty-all")
737738
optional("com.squareup.okhttp3:okhttp:${okhttp3Version}")
738739
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
739740
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
@@ -1001,7 +1002,7 @@ project("spring-websocket") {
10011002
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
10021003
testCompile("io.projectreactor:reactor-core")
10031004
testCompile("io.projectreactor.ipc:reactor-netty")
1004-
testCompile("io.netty:netty-all:${nettyVersion}")
1005+
testCompile("io.netty:netty-all")
10051006
}
10061007

10071008
if (JavaVersion.current().java9Compatible) {

0 commit comments

Comments
 (0)