Merge branch '3.5.x' into 4.0.x

Closes gh-50229

Author: snicoll

module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/reactive/ReactiveOAuth2ResourceServerConfiguration.java

@@ -33,9 +33,9 @@ class ReactiveOAuth2ResourceServerConfiguration {
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass({ BearerTokenAuthenticationToken.class, ReactiveJwtDecoder.class })
-	@Import({ ReactiveOAuth2ResourceServerJwkConfiguration.JwtConfiguration.class,
-			ReactiveOAuth2ResourceServerJwkConfiguration.JwtConverterConfiguration.class,
-			ReactiveOAuth2ResourceServerJwkConfiguration.WebSecurityConfiguration.class })
+	@Import({ ReactiveOAuth2ResourceServerJwtConfiguration.JwtConfiguration.class,
+			ReactiveOAuth2ResourceServerJwtConfiguration.JwtConverterConfiguration.class,
+			ReactiveOAuth2ResourceServerJwtConfiguration.WebSecurityConfiguration.class })
 	static class JwtConfiguration {
 
 	}

…Auth2ResourceServerJwkConfiguration.java …Auth2ResourceServerJwtConfiguration.javamodule/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java renamed to module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/reactive/ReactiveOAuth2ResourceServerJwtConfiguration.java module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java renamed to module/spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/reactive/ReactiveOAuth2ResourceServerJwtConfiguration.java

@@ -75,7 +75,7 @@
  * @author Yan Kardziyaka
  */
 @Configuration(proxyBeanMethods = false)
-class ReactiveOAuth2ResourceServerJwkConfiguration {
+class ReactiveOAuth2ResourceServerJwtConfiguration {
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnMissingBean(ReactiveJwtDecoder.class)