Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify Netty dependency management by importing its bom

Browse Source 
Closes gh-1409
This commit is contained in:
Eddú Meléndez
2017-04-29 14:48:08 -05:00
committed by Stephane Nicoll
parent 6f3051c677
commit 204ec6bf92
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
build.gradle
View File

@@ -220,6 +220,7 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
dependencyManagement { dependencyManagement {
imports { imports {
mavenBom "io.projectreactor:reactor-bom:${reactorVersion}" mavenBom "io.projectreactor:reactor-bom:${reactorVersion}"
mavenBom "io.netty:netty-bom:${nettyVersion}"
} }
resolutionStrategy { resolutionStrategy {
cacheChangingModulesFor 0, 'seconds' cacheChangingModulesFor 0, 'seconds'
@@ -385,7 +386,7 @@ project("spring-core") {
optional("io.reactivex:rxjava:${rxjavaVersion}") optional("io.reactivex:rxjava:${rxjavaVersion}")
optional("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}") optional("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")
optional("io.reactivex.rxjava2:rxjava:${rxjava2Version}") optional("io.reactivex.rxjava2:rxjava:${rxjava2Version}")
optional("io.netty:netty-buffer:${nettyVersion}") optional("io.netty:netty-buffer")
testCompile("io.projectreactor.addons:reactor-test") testCompile("io.projectreactor.addons:reactor-test")
testCompile("javax.xml.bind:jaxb-api:${jaxbVersion}") testCompile("javax.xml.bind:jaxb-api:${jaxbVersion}")
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
@@ -566,7 +567,7 @@ project("spring-messaging") {
optional(project(":spring-oxm")) optional(project(":spring-oxm"))
optional("io.projectreactor:reactor-core") optional("io.projectreactor:reactor-core")
optional("io.projectreactor.ipc:reactor-netty") optional("io.projectreactor.ipc:reactor-netty")
optional("io.netty:netty-all:${nettyVersion}") optional("io.netty:netty-all")
optional("org.eclipse.jetty.websocket:websocket-server:${jettyVersion}") { optional("org.eclipse.jetty.websocket:websocket-server:${jettyVersion}") {
exclude group: "javax.servlet", module: "javax.servlet-api" exclude group: "javax.servlet", module: "javax.servlet-api"
} }
@@ -587,7 +588,7 @@ project("spring-messaging") {
} }
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}") testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
testCompile("io.netty:netty-all:${nettyVersion}") testCompile("io.netty:netty-all")
testCompile("org.xmlunit:xmlunit-matchers:${xmlunitVersion}") testCompile("org.xmlunit:xmlunit-matchers:${xmlunitVersion}")
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile("org.jetbrains.kotlin:kotlin-stdlib-jre8:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-stdlib-jre8:${kotlinVersion}")
@@ -722,7 +723,7 @@ project("spring-web") {
optional("io.reactivex.rxjava2:rxjava:${rxjava2Version}") optional("io.reactivex.rxjava2:rxjava:${rxjava2Version}")
optional("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") optional("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
optional("io.undertow:undertow-core:${undertowVersion}") optional("io.undertow:undertow-core:${undertowVersion}")
optional("io.netty:netty-buffer:${nettyVersion}") // temporarily for JsonObjectDecoder optional("io.netty:netty-buffer") // temporarily for JsonObjectDecoder
optional("com.fasterxml.woodstox:woodstox-core:${woodstoxVersion}") { // woodstox before aalto optional("com.fasterxml.woodstox:woodstox-core:${woodstoxVersion}") { // woodstox before aalto
exclude group: "stax", module: "stax-api" exclude group: "stax", module: "stax-api"
} }
@@ -733,7 +734,7 @@ project("spring-web") {
optional("org.apache.httpcomponents:httpasyncclient:${httpasyncVersion}") { optional("org.apache.httpcomponents:httpasyncclient:${httpasyncVersion}") {
exclude group: "commons-logging", module: "commons-logging" exclude group: "commons-logging", module: "commons-logging"
} }
optional("io.netty:netty-all:${nettyVersion}") optional("io.netty:netty-all")
optional("com.squareup.okhttp3:okhttp:${okhttp3Version}") optional("com.squareup.okhttp3:okhttp:${okhttp3Version}")
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}") optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
@@ -1001,7 +1002,7 @@ project("spring-websocket") {
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}") testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
testCompile("io.projectreactor:reactor-core") testCompile("io.projectreactor:reactor-core")
testCompile("io.projectreactor.ipc:reactor-netty") testCompile("io.projectreactor.ipc:reactor-netty")
testCompile("io.netty:netty-all:${nettyVersion}") testCompile("io.netty:netty-all")
} }
if (JavaVersion.current().java9Compatible) { if (JavaVersion.current().java9Compatible) {