Juergen Hoeller 162e533393 Merge branch '6.2.x' ... # Conflicts: # spring-context/src/test/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java # spring-web/src/main/java/org/springframework/http/MediaType.java # spring-websocket/spring-websocket.gradle # spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java # spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequest.java		2024-12-04 16:45:54 +01:00
..
main	…
test	…