Merge branch '5.8.x' into 6.0.x
This commit is contained in:
commit
e3cc8d13e8
|
@ -21,7 +21,7 @@ Where a module depends on another Spring Security module, the non-optional depen
|
||||||
|
|
||||||
[[spring-security-core]]
|
[[spring-security-core]]
|
||||||
== Core -- `spring-security-core.jar`
|
== Core -- `spring-security-core.jar`
|
||||||
This module contains core authentication and access-contol classes and interfaces, remoting support, and basic provisioning APIs.
|
This module contains core authentication and access-control classes and interfaces, remoting support, and basic provisioning APIs.
|
||||||
It is required by any application that uses Spring Security.
|
It is required by any application that uses Spring Security.
|
||||||
It supports standalone applications, remote clients, method (service layer) security, and JDBC user provisioning.
|
It supports standalone applications, remote clients, method (service layer) security, and JDBC user provisioning.
|
||||||
It contains the following top-level packages:
|
It contains the following top-level packages:
|
||||||
|
@ -277,7 +277,7 @@ This is the basis of the Spring Security integration.
|
||||||
This module contains support for testing with Spring Security.
|
This module contains support for testing with Spring Security.
|
||||||
|
|
||||||
[[spring-security-taglibs]]
|
[[spring-security-taglibs]]
|
||||||
== Taglibs -- `spring-secuity-taglibs.jar`
|
== Taglibs -- `spring-security-taglibs.jar`
|
||||||
Provides Spring Security's JSP tag implementations.
|
Provides Spring Security's JSP tag implementations.
|
||||||
|
|
||||||
.Taglib Dependencies
|
.Taglib Dependencies
|
||||||
|
|
|
@ -140,11 +140,11 @@ public final class SecurityMockMvcResultMatchers {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Allows for any validating the authentication with arbitrary assertions
|
* Allows for any validating the authentication with arbitrary assertions
|
||||||
* @param assesrtAuthentication the Consumer which validates the authentication
|
* @param assertAuthentication the Consumer which validates the authentication
|
||||||
* @return the AuthenticatedMatcher to perform additional assertions
|
* @return the AuthenticatedMatcher to perform additional assertions
|
||||||
*/
|
*/
|
||||||
public AuthenticatedMatcher withAuthentication(Consumer<Authentication> assesrtAuthentication) {
|
public AuthenticatedMatcher withAuthentication(Consumer<Authentication> assertAuthentication) {
|
||||||
this.assertAuthentication = assesrtAuthentication;
|
this.assertAuthentication = assertAuthentication;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue