Merge branch '2.6.x' into 2.7.x

Closes gh-31846
pull/32861/head
Andy Wilkinson 2 years ago
commit ac3f552dde

@ -264,7 +264,7 @@ You can register multiple relying parties under the `spring.security.saml2.relyi
certificate-location: "path-to-certificate" certificate-location: "path-to-certificate"
singlelogout: singlelogout:
url: "https://myapp/logout/saml2/slo" url: "https://myapp/logout/saml2/slo"
reponse-url: "https://remoteidp2.slo.url" response-url: "https://remoteidp2.slo.url"
binding: "POST" binding: "POST"
assertingparty: assertingparty:
verification: verification:

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -163,7 +163,7 @@ public interface BootstrapRegistry {
} }
/** /**
* The scope of a instance. * The scope of an instance.
* @since 2.4.2 * @since 2.4.2
*/ */
enum Scope { enum Scope {

Loading…
Cancel
Save