Merge branch '2.1.x'

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

@@ -37,7 +37,7 @@ import org.springframework.security.oauth2.server.resource.authentication.JwtAut
 @EnableConfigurationProperties(OAuth2ResourceServerProperties.class)
 @ConditionalOnClass(JwtAuthenticationToken.class)
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
-@Import({ OAuth2ResourceServerJwkConfiguration.class,
+@Import({ OAuth2ResourceServerJwtConfiguration.class,
 		OAuth2ResourceServerWebSecurityConfiguration.class })
 public class OAuth2ResourceServerAutoConfiguration {
 

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

@@ -34,11 +34,11 @@ import org.springframework.security.oauth2.jwt.NimbusJwtDecoderJwkSupport;
  * @author Artsiom Yudovin
  */
 @Configuration
-class OAuth2ResourceServerJwkConfiguration {
+class OAuth2ResourceServerJwtConfiguration {
 
 	private final OAuth2ResourceServerProperties.Jwt properties;
 
-	OAuth2ResourceServerJwkConfiguration(OAuth2ResourceServerProperties properties) {
+	OAuth2ResourceServerJwtConfiguration(OAuth2ResourceServerProperties properties) {
 		this.properties = properties.getJwt();
 	}