Skip to content

Commit 8e7044b

Browse files
committed
Add spring-security-5.4.xsd
Issue gh-8138
1 parent ad9bb7f commit 8e7044b

File tree

6 files changed

+4299
-17
lines changed

6 files changed

+4299
-17
lines changed

config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
import org.apache.commons.logging.Log;
2222
import org.apache.commons.logging.LogFactory;
23+
import org.w3c.dom.Element;
24+
import org.w3c.dom.Node;
25+
2326
import org.springframework.beans.factory.config.BeanDefinition;
2427
import org.springframework.beans.factory.config.BeanDefinitionHolder;
2528
import org.springframework.beans.factory.xml.BeanDefinitionDecorator;
@@ -45,8 +48,6 @@
4548
import org.springframework.security.config.websocket.WebSocketMessageBrokerSecurityBeanDefinitionParser;
4649
import org.springframework.security.core.SpringSecurityCoreVersion;
4750
import org.springframework.util.ClassUtils;
48-
import org.w3c.dom.Element;
49-
import org.w3c.dom.Node;
5051

5152
/**
5253
* Parses elements from the "security" namespace
@@ -87,7 +88,7 @@ public BeanDefinition parse(Element element, ParserContext pc) {
8788
if (!namespaceMatchesVersion(element)) {
8889
pc.getReaderContext()
8990
.fatal("You cannot use a spring-security-2.0.xsd or spring-security-3.0.xsd or spring-security-3.1.xsd schema or spring-security-3.2.xsd schema or spring-security-4.0.xsd schema "
90-
+ "with Spring Security 5.3. Please update your schema declarations to the 5.3 schema.",
91+
+ "with Spring Security 5.4. Please update your schema declarations to the 5.4 schema.",
9192
element);
9293
}
9394
String name = pc.getDelegate().getLocalName(element);
@@ -223,7 +224,7 @@ private boolean namespaceMatchesVersion(Element element) {
223224
private boolean matchesVersionInternal(Element element) {
224225
String schemaLocation = element.getAttributeNS(
225226
"http://www.w3.org/2001/XMLSchema-instance", "schemaLocation");
226-
return schemaLocation.matches("(?m).*spring-security-5\\.3.*.xsd.*")
227+
return schemaLocation.matches("(?m).*spring-security-5\\.4.*.xsd.*")
227228
|| schemaLocation.matches("(?m).*spring-security.xsd.*")
228229
|| !schemaLocation.matches("(?m).*spring-security.*");
229230
}

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
http\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-5.3.xsd
1+
http\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-5.4.xsd
2+
http\://www.springframework.org/schema/security/spring-security-5.4.xsd=org/springframework/security/config/spring-security-5.4.xsd
23
http\://www.springframework.org/schema/security/spring-security-5.3.xsd=org/springframework/security/config/spring-security-5.3.xsd
34
http\://www.springframework.org/schema/security/spring-security-5.2.xsd=org/springframework/security/config/spring-security-5.2.xsd
45
http\://www.springframework.org/schema/security/spring-security-5.1.xsd=org/springframework/security/config/spring-security-5.1.xsd
@@ -14,7 +15,8 @@ http\://www.springframework.org/schema/security/spring-security-2.0.xsd=org/spri
1415
http\://www.springframework.org/schema/security/spring-security-2.0.1.xsd=org/springframework/security/config/spring-security-2.0.1.xsd
1516
http\://www.springframework.org/schema/security/spring-security-2.0.2.xsd=org/springframework/security/config/spring-security-2.0.2.xsd
1617
http\://www.springframework.org/schema/security/spring-security-2.0.4.xsd=org/springframework/security/config/spring-security-2.0.4.xsd
17-
https\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-5.3.xsd
18+
https\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-5.4.xsd
19+
https\://www.springframework.org/schema/security/spring-security-5.4.xsd=org/springframework/security/config/spring-security-5.4.xsd
1820
https\://www.springframework.org/schema/security/spring-security-5.3.xsd=org/springframework/security/config/spring-security-5.3.xsd
1921
https\://www.springframework.org/schema/security/spring-security-5.2.xsd=org/springframework/security/config/spring-security-5.2.xsd
2022
https\://www.springframework.org/schema/security/spring-security-5.1.xsd=org/springframework/security/config/spring-security-5.1.xsd

0 commit comments

Comments
 (0)