# Conflicts: # spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/ValidatorFactoryTests.java # spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java # spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java