Merge branch '1.5.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerConfiguration.java

@@ -161,6 +161,10 @@ public class OAuth2ResourceServerConfiguration {
 				return ConditionOutcome
 						.match(message.foundExactly("JWT resource configuration"));
 			}
+			if (!resolver.getSubProperties("jwk").isEmpty()) {
+				return ConditionOutcome
+						.match(message.foundExactly("JWK resource configuration"));
+			}
 			if (StringUtils.hasText(resolver.getProperty("user-info-uri"))) {
 				return ConditionOutcome
 						.match(message.foundExactly("user-info-uri property"));

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java

@@ -388,6 +388,16 @@ public class OAuth2AutoConfigurationTests {
 				.isEqualTo(PrePostAnnotationSecurityMetadataSource.class.getName());
 	}
 
+	@Test
+	public void resourceServerConditionWhenJwkConfigurationPresentShouldMatch() throws Exception {
+		this.context = new AnnotationConfigEmbeddedWebApplicationContext();
+		EnvironmentTestUtils.addEnvironment(this.context,
+				"security.oauth2.resource.jwk.key-set-uri:http://my-auth-server/token_keys");
+		this.context.register(ResourceServerConfiguration.class, MinimalSecureWebApplication.class);
+		this.context.refresh();
+		assertThat(countBeans(RESOURCE_SERVER_CONFIG)).isEqualTo(1);
+	}
+
 	/**
 	 * Connect to the oauth service, get a token, and then attempt some operations using
 	 * it.