Merge branch '2.7.x'

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java

@@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
 public class SecurityProperties {
 
 	/**
-	 * Order applied to the WebSecurityConfigurerAdapter that is used to configure basic
+	 * Order applied to the SecurityFilterChain that is used to configure basic
 	 * authentication for application endpoints. If you want to add your own
 	 * authentication for all or some of those endpoints the best thing to do is to add
 	 * your own WebSecurityConfigurerAdapter with lower order.
@@ -49,7 +49,7 @@ public class SecurityProperties {
 	public static final int BASIC_AUTH_ORDER = Ordered.LOWEST_PRECEDENCE - 5;
 
 	/**
-	 * Order applied to the WebSecurityConfigurer that ignores standard static resource
+	 * Order applied to the WebSecurityCustomizer that ignores standard static resource
 	 * paths.
 	 */
 	public static final int IGNORED_ORDER = Ordered.HIGHEST_PRECEDENCE;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -31,15 +31,13 @@ import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepo
 import org.springframework.security.web.SecurityFilterChain;
 
 /**
- * {@link org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter}
+ * {@link SecurityFilterChain} to add OAuth client support.
- * to add OAuth client support.
  *
  * @author Madhura Bhave
  * @author Phillip Webb
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnBean(ClientRegistrationRepository.class)
-@SuppressWarnings("deprecation")
 class OAuth2WebSecurityConfiguration {
 
 	@Bean

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -43,16 +43,14 @@ import org.springframework.security.web.SecurityFilterChain;
 
 /**
  * Configures a {@link JwtDecoder} when a JWK Set URI, OpenID Connect Issuer URI or Public
- * Key configuration is available. Also configures a
+ * Key configuration is available. Also configures a {@link SecurityFilterChain} if a
- * {@link org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter}
+ * {@link JwtDecoder} bean is found.
- * if a {@link JwtDecoder} bean is found.
  *
  * @author Madhura Bhave
  * @author Artsiom Yudovin
  * @author HaiTao Zhang
  */
 @Configuration(proxyBeanMethods = false)
-@SuppressWarnings("deprecation")
 class OAuth2ResourceServerJwtConfiguration {
 
 	@Configuration(proxyBeanMethods = false)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java

@@ -31,14 +31,12 @@ import org.springframework.security.web.SecurityFilterChain;
 
 /**
  * Configures a {@link OpaqueTokenIntrospector} when a token introspection endpoint is
- * available. Also configures a
+ * available. Also configures a {@link SecurityFilterChain} if a
- * {@link org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter}
+ * {@link OpaqueTokenIntrospector} bean is found.
- * if a {@link OpaqueTokenIntrospector} bean is found.
  *
  * @author Madhura Bhave
  */
 @Configuration(proxyBeanMethods = false)
-@SuppressWarnings("deprecation")
 class OAuth2ResourceServerOpaqueTokenConfiguration {
 
 	@Configuration(proxyBeanMethods = false)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2LoginConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -25,15 +25,14 @@ import org.springframework.security.saml2.provider.service.registration.RelyingP
 import org.springframework.security.web.SecurityFilterChain;
 
 /**
- * {@link org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter}
+ * {@link SecurityFilterChain} configuration for Spring Security's relying party SAML
- * configuration for Spring Security's relying party SAML support.
+ * support.
  *
  * @author Madhura Bhave
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnDefaultWebSecurity
 @ConditionalOnBean(RelyingPartyRegistrationRepository.class)
-@SuppressWarnings("deprecation")
 class Saml2LoginConfiguration {
 
 	@Bean