Merge branch '2.3.x'

Closes gh-22419

Merge branch '2.3.x'
Closes gh-22419
e4b065bd · Andy Wilkinson · 19ad1634 · 5795caea · e4b065bd
Commit e4b065bd authored Jul 21, 2020 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

build.gradle ...ring-boot-starters/spring-boot-starter-jetty/build.gradle +1 -0

No files found.
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle
@@ -19,6 +19,7 @@ dependencies {
 		exclude group: "javax.servlet", module: "javax.servlet-api"
 		exclude group: "javax.websocket", module: "javax.websocket-api"
 		exclude group: "javax.websocket", module: "javax.websocket-client-api"
+		exclude group: "org.eclipse.jetty", module: "jetty-jndi"
 	}
 	api("org.glassfish:jakarta.el")
 }