Merge branch '2.1.x'

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

spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/main/resources/application.yml

@@ -22,4 +22,4 @@ spring:
             client-secret: ${YAHOO-CLIENT-SECRET}
         provider:
           yahoo-oidc:
-            issuer-uri: https://api.login.yahoo.com
+            issuer-uri: https://api.login.yahoo.com

spring-boot-samples/spring-boot-sample-reactive-oauth2-resource-server/src/main/resources/application.yml

@@ -4,4 +4,4 @@ spring:
       resourceserver:
         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

spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html

@@ -3,4 +3,4 @@
 <h1>Hello</h1>
 Hello World!
 </body>
-</html>
+</html>