Leverage Jetty BOM

sdeleuze · sdeleuze · commit 3c9049d53040 · 2018-07-18T14:49:49.000+02:00
Issue: SPR-17058
diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle
@@ -4,6 +4,7 @@ dependencyManagement {
 	imports {
 		mavenBom "io.projectreactor:reactor-bom:${reactorVersion}"
 		mavenBom "io.netty:netty-bom:${nettyVersion}"
+		mavenBom "org.eclipse.jetty:jetty-bom:${jettyVersion}"
 	}
 }
 
@@ -13,10 +14,10 @@ dependencies {
 	optional(project(":spring-context"))
 	optional(project(":spring-oxm"))
 	optional("io.projectreactor.netty:reactor-netty")
-	optional("org.eclipse.jetty.websocket:websocket-server:${jettyVersion}") {
+	optional("org.eclipse.jetty.websocket:websocket-server") {
 		exclude group: "javax.servlet", module: "javax.servlet-api"
 	}
-	optional("org.eclipse.jetty.websocket:websocket-client:${jettyVersion}")
+	optional("org.eclipse.jetty.websocket:websocket-client")
 	optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 	optional("javax.xml.bind:jaxb-api:2.3.0")
 	testCompile("javax.inject:javax.inject-tck:1")
@@ -28,7 +29,7 @@ dependencies {
 		exclude group: "org.springframework", module: "spring-context"
 	}
 	testCompile("org.apache.activemq:activemq-stomp:5.8.0")
-	testCompile("org.eclipse.jetty:jetty-webapp:${jettyVersion}") {
+	testCompile("org.eclipse.jetty:jetty-webapp") {
 		exclude group: "javax.servlet", module: "javax.servlet-api"
 	}
 	testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
@@ -4,6 +4,7 @@ dependencyManagement {
 	imports {
 		mavenBom "io.projectreactor:reactor-bom:${reactorVersion}"
 		mavenBom "io.netty:netty-bom:${nettyVersion}"
+		mavenBom "org.eclipse.jetty:jetty-bom:${jettyVersion}"
 	}
 }
 
@@ -29,10 +30,10 @@ dependencies {
 	optional("io.netty:netty-all")
 	optional("io.projectreactor.netty:reactor-netty")
 	optional("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
-	optional("org.eclipse.jetty:jetty-server:${jettyVersion}") {
+	optional("org.eclipse.jetty:jetty-server") {
 		exclude group: "javax.servlet", module: "javax.servlet-api"
 	}
-	optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
+	optional("org.eclipse.jetty:jetty-servlet") {
 		exclude group: "javax.servlet", module: "javax.servlet-api"
 	}
 	optional("io.undertow:undertow-core:${undertowVersion}")
@@ -70,8 +71,8 @@ dependencies {
 	testCompile("com.fasterxml.jackson.module:jackson-module-kotlin:${jackson2Version}")
 	testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}")
 	testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
-	testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}")
-	testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}")
+	testCompile("org.eclipse.jetty:jetty-server")
+	testCompile("org.eclipse.jetty:jetty-servlet")
 	testCompile("com.squareup.okhttp3:mockwebserver:3.10.0")
 	testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	testCompile("org.skyscreamer:jsonassert:1.5.0")
diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle
@@ -4,6 +4,7 @@ dependencyManagement {
 	imports {
 		mavenBom "io.projectreactor:reactor-bom:${reactorVersion}"
 		mavenBom "io.netty:netty-bom:${nettyVersion}"
+		mavenBom "org.eclipse.jetty:jetty-bom:${jettyVersion}"
 	}
 }
 
@@ -27,7 +28,7 @@ dependencies {
 		exclude group: "org.apache.tomcat", module: "tomcat-websocket-api"
 		exclude group: "org.apache.tomcat", module: "tomcat-servlet-api"
 	}
-	optional("org.eclipse.jetty.websocket:websocket-server:${jettyVersion}") {
+	optional("org.eclipse.jetty.websocket:websocket-server") {
 		exclude group: "javax.servlet", module: "javax.servlet"
 	}
 	optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") {
@@ -44,8 +45,8 @@ dependencies {
 	testCompile("io.projectreactor:reactor-test")
 	testCompile("org.apache.tomcat:tomcat-util:${tomcatVersion}")
 	testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
-	testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}")
-	testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}")
+	testCompile("org.eclipse.jetty:jetty-server")
+	testCompile("org.eclipse.jetty:jetty-servlet")
 	testCompile("io.undertow:undertow-core:${undertowVersion}")
 	testCompile("com.fasterxml:aalto-xml:1.1.0")
 	testCompile("com.squareup.okhttp3:mockwebserver:3.10.0")
diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle
@@ -3,6 +3,7 @@ description = "Spring Web MVC"
 dependencyManagement {
 	imports {
 		mavenBom "io.projectreactor:reactor-bom:${reactorVersion}"
+		mavenBom "org.eclipse.jetty:jetty-bom:${jettyVersion}"
 	}
 }
 
@@ -43,10 +44,10 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
 	optional("org.reactivestreams:reactive-streams")
 	testCompile("javax.servlet:javax.servlet-api:4.0.1")
-	testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
+	testCompile("org.eclipse.jetty:jetty-servlet") {
 		exclude group: "javax.servlet", module: "javax.servlet"
 	}
-	testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") {
+	testCompile("org.eclipse.jetty:jetty-server") {
 		exclude group: "javax.servlet", module: "javax.servlet"
 	}
 	testCompile("org.hibernate:hibernate-validator:6.0.10.Final")
diff --git a/spring-websocket/spring-websocket.gradle b/spring-websocket/spring-websocket.gradle
@@ -4,6 +4,7 @@ dependencyManagement {
 	imports {
 		mavenBom "io.projectreactor:reactor-bom:${reactorVersion}"
 		mavenBom "io.netty:netty-bom:${nettyVersion}"
+		mavenBom "org.eclipse.jetty:jetty-bom:${jettyVersion}"
 	}
 }
 
@@ -20,14 +21,14 @@ dependencies {
 		exclude group: "org.apache.tomcat", module: "tomcat-servlet-api"
 	}
 	optional("org.glassfish.tyrus:tyrus-container-servlet:1.13.1")
-	optional("org.eclipse.jetty:jetty-webapp:${jettyVersion}") {
+	optional("org.eclipse.jetty:jetty-webapp") {
 		exclude group: "javax.servlet", module: "javax.servlet"
 	}
-	optional("org.eclipse.jetty.websocket:websocket-server:${jettyVersion}") {
+	optional("org.eclipse.jetty.websocket:websocket-server") {
 		exclude group: "javax.servlet", module: "javax.servlet"
 	}
-	optional("org.eclipse.jetty.websocket:websocket-client:${jettyVersion}")
-	optional("org.eclipse.jetty:jetty-client:${jettyVersion}")
+	optional("org.eclipse.jetty.websocket:websocket-client")
+	optional("org.eclipse.jetty:jetty-client")
 	optional("io.undertow:undertow-servlet:${undertowVersion}") {
 		exclude group: "org.jboss.spec.javax.servlet", module: "jboss-servlet-api_3.1_spec"
 		exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.2_spec"

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ dependencyManagement {`
`4`	`4`	`imports {`
`5`	`5`	`mavenBom "io.projectreactor:reactor-bom:${reactorVersion}"`
`6`	`6`	`mavenBom "io.netty:netty-bom:${nettyVersion}"`
	`7`	`+ mavenBom "org.eclipse.jetty:jetty-bom:${jettyVersion}"`
`7`	`8`	`}`
`8`	`9`	`}`
`9`	`10`
`@@ -13,10 +14,10 @@ dependencies {`
`13`	`14`	`optional(project(":spring-context"))`
`14`	`15`	`optional(project(":spring-oxm"))`
`15`	`16`	`optional("io.projectreactor.netty:reactor-netty")`
`16`		`- optional("org.eclipse.jetty.websocket:websocket-server:${jettyVersion}") {`
	`17`	`+ optional("org.eclipse.jetty.websocket:websocket-server") {`
`17`	`18`	`exclude group: "javax.servlet", module: "javax.servlet-api"`
`18`	`19`	`}`
`19`		`- optional("org.eclipse.jetty.websocket:websocket-client:${jettyVersion}")`
	`20`	`+ optional("org.eclipse.jetty.websocket:websocket-client")`
`20`	`21`	`optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")`
`21`	`22`	`optional("javax.xml.bind:jaxb-api:2.3.0")`
`22`	`23`	`testCompile("javax.inject:javax.inject-tck:1")`
`@@ -28,7 +29,7 @@ dependencies {`
`28`	`29`	`exclude group: "org.springframework", module: "spring-context"`
`29`	`30`	`}`
`30`	`31`	`testCompile("org.apache.activemq:activemq-stomp:5.8.0")`
`31`		`- testCompile("org.eclipse.jetty:jetty-webapp:${jettyVersion}") {`
	`32`	`+ testCompile("org.eclipse.jetty:jetty-webapp") {`
`32`	`33`	`exclude group: "javax.servlet", module: "javax.servlet-api"`
`33`	`34`	`}`
`34`	`35`	`testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ description = "Spring Web MVC"`
`3`	`3`	`dependencyManagement {`
`4`	`4`	`imports {`
`5`	`5`	`mavenBom "io.projectreactor:reactor-bom:${reactorVersion}"`
	`6`	`+ mavenBom "org.eclipse.jetty:jetty-bom:${jettyVersion}"`
`6`	`7`	`}`
`7`	`8`	`}`
`8`	`9`
`@@ -43,10 +44,10 @@ dependencies {`
`43`	`44`	`optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")`
`44`	`45`	`optional("org.reactivestreams:reactive-streams")`
`45`	`46`	`testCompile("javax.servlet:javax.servlet-api:4.0.1")`
`46`		`- testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {`
	`47`	`+ testCompile("org.eclipse.jetty:jetty-servlet") {`
`47`	`48`	`exclude group: "javax.servlet", module: "javax.servlet"`
`48`	`49`	`}`
`49`		`- testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") {`
	`50`	`+ testCompile("org.eclipse.jetty:jetty-server") {`
`50`	`51`	`exclude group: "javax.servlet", module: "javax.servlet"`
`51`	`52`	`}`
`52`	`53`	`testCompile("org.hibernate:hibernate-validator:6.0.10.Final")`