Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-05-31 09:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to Spring Security 5.6

Browse Source 
Closes gh-9695
This commit is contained in:
Josh Cummings 2021-04-29 17:26:47 -06:00
parent 8c0248d0dc
commit d203235567
No known key found for this signature in database
GPG Key ID: 49EF60DD7FF83443
7 changed files with 4324 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/src/main/resources/META-INF/spring.schemas
View File

@ -1,4 +1,5 @@
http\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-5.5.xsd http\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-5.6.xsd
http\://www.springframework.org/schema/security/spring-security-5.6.xsd=org/springframework/security/config/spring-security-5.6.xsd
http\://www.springframework.org/schema/security/spring-security-5.5.xsd=org/springframework/security/config/spring-security-5.5.xsd http\://www.springframework.org/schema/security/spring-security-5.5.xsd=org/springframework/security/config/spring-security-5.5.xsd
http\://www.springframework.org/schema/security/spring-security-5.4.xsd=org/springframework/security/config/spring-security-5.4.xsd http\://www.springframework.org/schema/security/spring-security-5.4.xsd=org/springframework/security/config/spring-security-5.4.xsd
http\://www.springframework.org/schema/security/spring-security-5.3.xsd=org/springframework/security/config/spring-security-5.3.xsd http\://www.springframework.org/schema/security/spring-security-5.3.xsd=org/springframework/security/config/spring-security-5.3.xsd
@ -16,7 +17,8 @@ http\://www.springframework.org/schema/security/spring-security-2.0.xsd=org/spri
http\://www.springframework.org/schema/security/spring-security-2.0.1.xsd=org/springframework/security/config/spring-security-2.0.1.xsd http\://www.springframework.org/schema/security/spring-security-2.0.1.xsd=org/springframework/security/config/spring-security-2.0.1.xsd
http\://www.springframework.org/schema/security/spring-security-2.0.2.xsd=org/springframework/security/config/spring-security-2.0.2.xsd http\://www.springframework.org/schema/security/spring-security-2.0.2.xsd=org/springframework/security/config/spring-security-2.0.2.xsd
http\://www.springframework.org/schema/security/spring-security-2.0.4.xsd=org/springframework/security/config/spring-security-2.0.4.xsd http\://www.springframework.org/schema/security/spring-security-2.0.4.xsd=org/springframework/security/config/spring-security-2.0.4.xsd
https\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-5.5.xsd https\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-5.6.xsd
https\://www.springframework.org/schema/security/spring-security-5.6.xsd=org/springframework/security/config/spring-security-5.6.xsd
https\://www.springframework.org/schema/security/spring-security-5.5.xsd=org/springframework/security/config/spring-security-5.5.xsd https\://www.springframework.org/schema/security/spring-security-5.5.xsd=org/springframework/security/config/spring-security-5.5.xsd
https\://www.springframework.org/schema/security/spring-security-5.4.xsd=org/springframework/security/config/spring-security-5.4.xsd https\://www.springframework.org/schema/security/spring-security-5.4.xsd=org/springframework/security/config/spring-security-5.4.xsd
https\://www.springframework.org/schema/security/spring-security-5.3.xsd=org/springframework/security/config/spring-security-5.3.xsd https\://www.springframework.org/schema/security/spring-security-5.3.xsd=org/springframework/security/config/spring-security-5.3.xsd

1106
config/src/main/resources/org/springframework/security/config/spring-security-5.6.rnc Normal file
View File

File diff suppressed because it is too large Load Diff

3208
config/src/main/resources/org/springframework/security/config/spring-security-5.6.xsd Normal file
View File

File diff suppressed because it is too large Load Diff

6
config/src/test/java/org/springframework/security/config/doc/XsdDocumentedTests.java
View File

@ -65,7 +65,7 @@ public class XsdDocumentedTests {
String schema31xDocumentLocation = "org/springframework/security/config/spring-security-3.1.xsd"; String schema31xDocumentLocation = "org/springframework/security/config/spring-security-3.1.xsd";
String schemaDocumentLocation = "org/springframework/security/config/spring-security-5.5.xsd"; String schemaDocumentLocation = "org/springframework/security/config/spring-security-5.6.xsd";
XmlSupport xml = new XmlSupport(); XmlSupport xml = new XmlSupport();
@ -150,8 +150,8 @@ public class XsdDocumentedTests {
.getParentFile() .getParentFile()
.list((dir, name) -> name.endsWith(".xsd")); .list((dir, name) -> name.endsWith(".xsd"));
// @formatter:on // @formatter:on
assertThat(schemas.length).isEqualTo(17) assertThat(schemas.length).isEqualTo(18)
.withFailMessage("the count is equal to 17, if not then schemaDocument needs updating"); .withFailMessage("the count is equal to 18, if not then schemaDocument needs updating");
} }
/** /**

2
core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
View File

@ -43,7 +43,7 @@ public final class SpringSecurityCoreVersion {
* N.B. Classes are not intended to be serializable between different versions. See * N.B. Classes are not intended to be serializable between different versions. See
* SEC-1709 for why we still need a serial version. * SEC-1709 for why we still need a serial version.
*/ */
public static final long SERIAL_VERSION_UID = 550L; public static final long SERIAL_VERSION_UID = 560L;
static final String MIN_SPRING_VERSION = getSpringVersion(); static final String MIN_SPRING_VERSION = getSpringVersion();

2
gradle.properties
View File

@ -2,7 +2,7 @@ aspectjVersion=1.9.6
springJavaformatVersion=0.0.28 springJavaformatVersion=0.0.28
springBootVersion=2.4.2 springBootVersion=2.4.2
openSamlVersion=3.4.6 openSamlVersion=3.4.6
version=5.5.1-SNAPSHOT version=5.6.0-SNAPSHOT
kotlinVersion=1.5.0 kotlinVersion=1.5.0
org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError
org.gradle.parallel=true org.gradle.parallel=true

2
taglibs/src/main/resources/META-INF/security.tld
View File

@ -20,7 +20,7 @@
version="2.0"> version="2.0">
<description>Spring Security Authorization Tag Library</description> <description>Spring Security Authorization Tag Library</description>
<tlib-version>5.5</tlib-version> <tlib-version>5.6</tlib-version>
<short-name>security</short-name> <short-name>security</short-name>
<uri>http://www.springframework.org/security/tags</uri> <uri>http://www.springframework.org/security/tags</uri>