Skip to content

Commit 2fcd305

Browse files
committed
Increment to 6.5.0-SNAPSHOT
Closes gh-16221
1 parent 7e83fd5 commit 2fcd305

File tree

13 files changed

+5225
-404
lines changed

13 files changed

+5225
-404
lines changed

.github/dependabot.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,31 @@ registries:
44
type: maven-repository
55
url: https://repo.spring.io/milestone
66
updates:
7+
- package-ecosystem: gradle
8+
target-branch: 6.4.x
9+
directory: /
10+
schedule:
11+
interval: daily
12+
time: '03:00'
13+
timezone: Etc/UTC
14+
labels:
15+
- 'type: dependency-upgrade'
16+
registries:
17+
- spring-milestones
18+
ignore:
19+
- dependency-name: com.nimbusds:nimbus-jose-jwt
20+
- dependency-name: org.python:jython
21+
- dependency-name: org.apache.directory.server:*
22+
- dependency-name: org.junit:junit-bom
23+
update-types:
24+
- version-update:semver-major
25+
- dependency-name: org.mockito:mockito-bom
26+
update-types:
27+
- version-update:semver-major
28+
- dependency-name: '*'
29+
update-types:
30+
- version-update:semver-major
31+
- version-update:semver-minor
732
- package-ecosystem: gradle
833
target-branch: 6.3.x
934
directory: /
@@ -58,6 +83,16 @@ updates:
5883
update-types:
5984
- version-update:semver-major
6085

86+
- package-ecosystem: github-actions
87+
target-branch: 6.4.x
88+
directory: /
89+
schedule:
90+
interval: weekly
91+
labels:
92+
- 'type: task'
93+
- 'in: build'
94+
ignore:
95+
- dependency-name: sjohnr/*
6196
- package-ecosystem: github-actions
6297
target-branch: 6.3.x
6398
directory: /
@@ -66,6 +101,8 @@ updates:
66101
labels:
67102
- 'type: task'
68103
- 'in: build'
104+
ignore:
105+
- dependency-name: sjohnr/*
69106
- package-ecosystem: github-actions
70107
target-branch: main
71108
directory: /

.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.3.x, 6.2.x, 5.8.x ]
14+
branch: [ main, 6.4.x, 6.3.x, 6.2.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.4. Please update your schema declarations to the 6.4 schema.",
99+
+ "with Spring Security 6.5. Please update your schema declarations to the 6.5 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\\.4.*.xsd.*")
224+
return schemaLocation.matches("(?m).*spring-security-6\\.5.*.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
@@ -14,7 +14,8 @@
1414
# limitations under the License.
1515
#
1616

17-
http\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-6.4.xsd
17+
http\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-6.5.xsd
18+
http\://www.springframework.org/schema/security/spring-security-6.5.xsd=org/springframework/security/config/spring-security-6.5.xsd
1819
http\://www.springframework.org/schema/security/spring-security-6.4.xsd=org/springframework/security/config/spring-security-6.4.xsd
1920
http\://www.springframework.org/schema/security/spring-security-6.3.xsd=org/springframework/security/config/spring-security-6.3.xsd
2021
http\://www.springframework.org/schema/security/spring-security-6.2.xsd=org/springframework/security/config/spring-security-6.2.xsd
@@ -40,7 +41,8 @@ http\://www.springframework.org/schema/security/spring-security-2.0.xsd=org/spri
4041
http\://www.springframework.org/schema/security/spring-security-2.0.1.xsd=org/springframework/security/config/spring-security-2.0.1.xsd
4142
http\://www.springframework.org/schema/security/spring-security-2.0.2.xsd=org/springframework/security/config/spring-security-2.0.2.xsd
4243
http\://www.springframework.org/schema/security/spring-security-2.0.4.xsd=org/springframework/security/config/spring-security-2.0.4.xsd
43-
https\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-6.4.xsd
44+
https\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-6.5.xsd
45+
https\://www.springframework.org/schema/security/spring-security-6.5.xsd=org/springframework/security/config/spring-security-6.5.xsd
4446
https\://www.springframework.org/schema/security/spring-security-6.4.xsd=org/springframework/security/config/spring-security-6.4.xsd
4547
https\://www.springframework.org/schema/security/spring-security-6.3.xsd=org/springframework/security/config/spring-security-6.3.xsd
4648
https\://www.springframework.org/schema/security/spring-security-6.2.xsd=org/springframework/security/config/spring-security-6.2.xsd

0 commit comments

Comments
 (0)