Merge branch '2.3.x'

Closes gh-22419
2020-07-21 09:32:23 +01:00
parent 19ad163486 5795caea81
commit e4b065bdd9
1 changed files with 1 additions and 0 deletions
--- 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")
 }