Merge branch '6.1.x' into 6.2.x

Closes gh-14280
2023-12-11 11:45:16 -07:00 · 2023-12-11 11:45:16 -07:00 · d130a18d3c
parent 966c01fa90 f0772dc788
commit d130a18d3c
2 changed files with 2 additions and 2 deletions
--- a/docs/modules/ROOT/pages/reactive/oauth2/resource-server/jwt.adoc
+++ b/docs/modules/ROOT/pages/reactive/oauth2/resource-server/jwt.adoc
@ -434,7 +434,7 @@ spring:
    oauth2:
      resourceserver:
        jwt:
-          jws-algorithm: RS512
+          jws-algorithms: RS512
          jwk-set-uri: https://idp.example.org/.well-known/jwks.json
 ----

--- a/docs/modules/ROOT/pages/servlet/oauth2/resource-server/jwt.adoc
+++ b/docs/modules/ROOT/pages/servlet/oauth2/resource-server/jwt.adoc
@ -574,7 +574,7 @@ spring:
    oauth2:
      resourceserver:
        jwt:
-          jws-algorithm: RS512
+          jws-algorithms: RS512
          jwk-set-uri: https://idp.example.org/.well-known/jwks.json
 ----