Browse Source

Bump Schema, Serialization, and Taglib to 5.5

pull/8455/head
Josh Cummings 5 years ago
parent
commit
ce68431037
No known key found for this signature in database
GPG Key ID: 49EF60DD7FF83443
  1. 3
      config/src/main/resources/META-INF/spring.schemas
  2. 1099
      config/src/main/resources/org/springframework/security/config/spring-security-5.5.rnc
  3. 3188
      config/src/main/resources/org/springframework/security/config/spring-security-5.5.xsd
  4. 4
      config/src/test/java/org/springframework/security/config/doc/XsdDocumentedTests.java
  5. 2
      core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
  6. 2
      taglibs/src/main/resources/META-INF/security.tld

3
config/src/main/resources/META-INF/spring.schemas

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
http\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-5.4.xsd
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-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
http\://www.springframework.org/schema/security/spring-security-5.2.xsd=org/springframework/security/config/spring-security-5.2.xsd

1099
config/src/main/resources/org/springframework/security/config/spring-security-5.5.rnc

File diff suppressed because it is too large Load Diff

3188
config/src/main/resources/org/springframework/security/config/spring-security-5.5.xsd

File diff suppressed because it is too large Load Diff

4
config/src/test/java/org/springframework/security/config/doc/XsdDocumentedTests.java

@ -150,8 +150,8 @@ public class XsdDocumentedTests { @@ -150,8 +150,8 @@ public class XsdDocumentedTests {
.getParentFile()
.list((dir, name) -> name.endsWith(".xsd"));
// @formatter:on
assertThat(schemas.length).isEqualTo(16)
.withFailMessage("the count is equal to 16, if not then schemaDocument needs updating");
assertThat(schemas.length).isEqualTo(17)
.withFailMessage("the count is equal to 17, if not then schemaDocument needs updating");
}
/**

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

@ -43,7 +43,7 @@ public final class SpringSecurityCoreVersion { @@ -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 = 540L;
public static final long SERIAL_VERSION_UID = 550L;
static final String MIN_SPRING_VERSION = getSpringVersion();

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

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

Loading…
Cancel
Save