Merge branch '2.0.x' into 2.1.x

2019-06-04 14:21:09 -07:00
parent 930d110178 7fc01971ed
commit 0ef331018e
31 changed files with 38 additions and 17 deletions
--- a/spring-boot-samples/spring-boot-sample-oauth2-resource-server/src/main/resources/application.yml
+++ b/spring-boot-samples/spring-boot-sample-oauth2-resource-server/src/main/resources/application.yml
@@ -4,4 +4,4 @@ spring:
      resource:
        jwt:
        # To run the application, replace this with a valid JWK Set URI
-          jwk-set-uri: https://example.com/oauth2/default/v1/keys
+          jwk-set-uri: https://example.com/oauth2/default/v1/keys