Merge branch '2.2.x'

Closes gh-20549

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/reactive/ReactiveOAuth2ClientConfigurations.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -45,7 +45,7 @@ import org.springframework.security.web.server.SecurityWebFilterChain;
  */
 class ReactiveOAuth2ClientConfigurations {
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@Conditional(ClientsConfiguredCondition.class)
 	@ConditionalOnMissingBean(ReactiveClientRegistrationRepository.class)
 	static class ReactiveClientRegistrationRepositoryConfiguration {
@@ -59,7 +59,7 @@ class ReactiveOAuth2ClientConfigurations {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnBean(ReactiveClientRegistrationRepository.class)
 	static class ReactiveOAuth2ClientConfiguration {
 
@@ -77,7 +77,7 @@ class ReactiveOAuth2ClientConfigurations {
 			return new AuthenticatedPrincipalServerOAuth2AuthorizedClientRepository(authorizedClientService);
 		}
 
-		@Configuration
+		@Configuration(proxyBeanMethods = false)
 		@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
 		static class SecurityWebFilterChainConfiguration {
 

spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevtoolsSecurityConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -32,7 +32,7 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
  * @author Madhura Bhave
  */
 @ConditionalOnClass(WebSecurityConfigurerAdapter.class)
-@Configuration
+@Configuration(proxyBeanMethods = false)
 class RemoteDevtoolsSecurityConfiguration {
 
 	@Order(SecurityProperties.BASIC_AUTH_ORDER - 1)