Skip to content

Commit d50698a

Browse files
committed
Prepare for Spring Security 6.3
Closes gh-14210
1 parent 674ce38 commit d50698a

File tree

14 files changed

+5198
-41
lines changed

14 files changed

+5198
-41
lines changed

.github/dependabot.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,28 @@ updates:
99

1010
- package-ecosystem: "gradle"
1111
target-branch: "main"
12+
milestone: 326 # 6.3.x
13+
directory: "/"
14+
schedule:
15+
interval: "daily"
16+
time: "03:00"
17+
timezone: "Etc/UTC"
18+
labels: [ "type: dependency-upgrade" ]
19+
registries:
20+
- "spring-milestones"
21+
ignore:
22+
- dependency-name: "com.nimbusds:nimbus-jose-jwt" # nimbus-jose-jwt gets updated when oauth2-oidc-sdk is updated to ensure consistency
23+
- dependency-name: "org.python:jython" # jython updates break integration tests
24+
- dependency-name: "org.apache.directory.server:*" # ApacheDS version > 1.5.5 contains break changes
25+
- dependency-name: "org.junit:junit-bom"
26+
update-types: [ "version-update:semver-major" ]
27+
- dependency-name: "org.mockito:mockito-bom"
28+
update-types: [ "version-update:semver-major" ]
29+
- dependency-name: "*"
30+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
31+
32+
- package-ecosystem: "gradle"
33+
target-branch: "6.2.x"
1234
milestone: 319 # 6.2.x
1335
directory: "/"
1436
schedule:

.github/workflows/release-scheduler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
# List of active maintenance branches.
14-
branch: [ main, 6.1.x, 5.8.x ]
14+
branch: [ main, 6.2.x, 6.1.x, 5.8.x ]
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public BeanDefinition parse(Element element, ParserContext pc) {
9696
pc.getReaderContext()
9797
.fatal("You cannot use a spring-security-2.0.xsd or spring-security-3.0.xsd or "
9898
+ "spring-security-3.1.xsd schema or spring-security-3.2.xsd schema or spring-security-4.0.xsd schema "
99-
+ "with Spring Security 6.2. Please update your schema declarations to the 6.2 schema.",
99+
+ "with Spring Security 6.3. Please update your schema declarations to the 6.3 schema.",
100100
element);
101101
}
102102
String name = pc.getDelegate().getLocalName(element);
@@ -221,7 +221,7 @@ private boolean namespaceMatchesVersion(Element element) {
221221

222222
private boolean matchesVersionInternal(Element element) {
223223
String schemaLocation = element.getAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "schemaLocation");
224-
return schemaLocation.matches("(?m).*spring-security-6\\.2.*.xsd.*")
224+
return schemaLocation.matches("(?m).*spring-security-6\\.3.*.xsd.*")
225225
|| schemaLocation.matches("(?m).*spring-security.xsd.*")
226226
|| !schemaLocation.matches("(?m).*spring-security.*");
227227
}

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

Lines changed: 4 additions & 2 deletions
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-6.2.xsd
1+
http\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-6.3.xsd
2+
http\://www.springframework.org/schema/security/spring-security-6.3.xsd=org/springframework/security/config/spring-security-6.3.xsd
23
http\://www.springframework.org/schema/security/spring-security-6.2.xsd=org/springframework/security/config/spring-security-6.2.xsd
34
http\://www.springframework.org/schema/security/spring-security-6.1.xsd=org/springframework/security/config/spring-security-6.1.xsd
45
http\://www.springframework.org/schema/security/spring-security-6.0.xsd=org/springframework/security/config/spring-security-6.0.xsd
@@ -22,7 +23,8 @@ http\://www.springframework.org/schema/security/spring-security-2.0.xsd=org/spri
2223
http\://www.springframework.org/schema/security/spring-security-2.0.1.xsd=org/springframework/security/config/spring-security-2.0.1.xsd
2324
http\://www.springframework.org/schema/security/spring-security-2.0.2.xsd=org/springframework/security/config/spring-security-2.0.2.xsd
2425
http\://www.springframework.org/schema/security/spring-security-2.0.4.xsd=org/springframework/security/config/spring-security-2.0.4.xsd
25-
https\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-6.2.xsd
26+
https\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-6.3.xsd
27+
https\://www.springframework.org/schema/security/spring-security-6.3.xsd=org/springframework/security/config/spring-security-6.3.xsd
2628
https\://www.springframework.org/schema/security/spring-security-6.2.xsd=org/springframework/security/config/spring-security-6.2.xsd
2729
https\://www.springframework.org/schema/security/spring-security-6.1.xsd=org/springframework/security/config/spring-security-6.1.xsd
2830
https\://www.springframework.org/schema/security/spring-security-6.0.xsd=org/springframework/security/config/spring-security-6.0.xsd

0 commit comments

Comments
 (0)