Skip to content

Commit

Permalink
Update to Spring Security 5.6
Browse files Browse the repository at this point in the history
Closes gh-9695
  • Loading branch information
jzheaux committed May 18, 2021
1 parent 8c0248d commit d203235
Show file tree
Hide file tree
Showing 7 changed files with 4,324 additions and 8 deletions.
6 changes: 4 additions & 2 deletions config/src/main/resources/META-INF/spring.schemas
Original file line number Diff line number Diff line change
@@ -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.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
Expand All @@ -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.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
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.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
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public class XsdDocumentedTests {

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();

Expand Down Expand Up @@ -150,8 +150,8 @@ public void sizeWhenReadingFilesystemThenIsCorrectNumberOfSchemaFiles() throws I
.getParentFile()
.list((dir, name) -> name.endsWith(".xsd"));
// @formatter:on
assertThat(schemas.length).isEqualTo(17)
.withFailMessage("the count is equal to 17, if not then schemaDocument needs updating");
assertThat(schemas.length).isEqualTo(18)
.withFailMessage("the count is equal to 18, if not then schemaDocument needs updating");
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public final class SpringSecurityCoreVersion {
* N.B. Classes are not intended to be serializable between different versions. See
* 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();

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ aspectjVersion=1.9.6
springJavaformatVersion=0.0.28
springBootVersion=2.4.2
openSamlVersion=3.4.6
version=5.5.1-SNAPSHOT
version=5.6.0-SNAPSHOT
kotlinVersion=1.5.0
org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError
org.gradle.parallel=true
Expand Down
2 changes: 1 addition & 1 deletion taglibs/src/main/resources/META-INF/security.tld
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
version="2.0">
<description>Spring Security Authorization Tag Library</description>

<tlib-version>5.5</tlib-version>
<tlib-version>5.6</tlib-version>
<short-name>security</short-name>
<uri>http://www.springframework.org/security/tags</uri>

Expand Down

0 comments on commit d203235

Please sign in to comment.