Merge branch '3.3.x' into 3.4.x

Closes gh-45651
2025-05-23 14:19:15 +01:00
parent d98ca77235 1e47eb621e
commit 86cd7ecaca
5 changed files with 19 additions and 9 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java
@@ -264,7 +264,7 @@ class SecurityAutoConfigurationTests {

 		@Bean
 		@ConfigurationPropertiesBinding
-		Converter<String, TargetType> targetTypeConverter() {
+		static Converter<String, TargetType> targetTypeConverter() {
 			return new Converter<>() {

 				@Override