Merge branch '3.3.x' into 3.4.x

Closes gh-44936

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,6 @@
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.security.oauth2.server.resource.introspection.ReactiveOpaqueTokenIntrospector;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -108,14 +107,6 @@ void doesNotConfigureDefaultUserIfAuthenticationManagerResolverAvailable() {
 				.doesNotHaveBean(ReactiveUserDetailsService.class));
 	}
 
-	@Test
-	void doesNotConfigureDefaultUserIfResourceServerWithJWTIsUsed() {
-		this.contextRunner.withUserConfiguration(JwtDecoderConfiguration.class).run((context) -> {
-			assertThat(context).hasSingleBean(ReactiveJwtDecoder.class);
-			assertThat(context).doesNotHaveBean(ReactiveUserDetailsService.class);
-		});
-	}
-
 	@Test
 	void doesNotConfigureDefaultUserIfResourceServerIsPresent() {
 		this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean(ReactiveUserDetailsService.class));
@@ -232,24 +223,4 @@ PasswordEncoder passwordEncoder() {
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	static class JwtDecoderConfiguration {
-
-		@Bean
-		ReactiveJwtDecoder jwtDecoder() {
-			return mock(ReactiveJwtDecoder.class);
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	static class ReactiveOpaqueTokenIntrospectorConfiguration {
-
-		@Bean
-		ReactiveOpaqueTokenIntrospector introspectionClient() {
-			return mock(ReactiveOpaqueTokenIntrospector.class);
-		}
-
-	}
-
 }