Juergen Hoeller 25ea1f4c0f Merge branch '6.0.x' ...

# Conflicts:
#	spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java

2023-07-19 00:37:06 +02:00

..

src

Merge branch '6.0.x'

2023-07-19 00:37:06 +02:00

spring-websocket.gradle

Align with Servlet 6.0 and introduce support for Jakarta WebSocket 2.1

2022-11-06 16:08:30 +01:00