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

Merge branch '6.0.x'

Browse Source 
# Conflicts:
#	spring-jcl/src/main/java/org/apache/commons/logging/LogFactory.java
This commit is contained in:
Juergen Hoeller
2023-06-21 09:51:11 +02:00
parent 24457660e3 adcdefce43
commit 1a201cd180
7 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/spring-web.gradle
View File

@@ -37,7 +37,7 @@ 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.beta1") {
optional("org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.0.beta2") {
exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
exclude group: "org.eclipse.jetty", module: "jetty-ee"
exclude group: "org.eclipse.jetty", module: "jetty-security"