Merge branch '6.0.x'

This commit is contained in:
Juergen Hoeller
2023-05-08 14:52:26 +02:00
4 changed files with 5 additions and 4 deletions

View File

@@ -37,8 +37,10 @@ dependencies {
optional("org.eclipse.jetty:jetty-servlet") {
exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
}
optional("org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.0.beta0") {
optional("org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.0.beta1") {
exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
exclude group: "org.eclipse.jetty", module: "jetty-ee"
exclude group: "org.eclipse.jetty", module: "jetty-security"
exclude group: "org.eclipse.jetty", module: "jetty-server"
exclude group: "org.eclipse.jetty", module: "jetty-servlet"
}