Skip to content

Commit 5abbcec

Browse files
committed
Update to 7.0.0-SNAPSHOT
Signed-off-by: Rob Winch <[email protected]>
1 parent c385a59 commit 5abbcec

File tree

187 files changed

+5240
-40
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+5240
-40
lines changed

.github/dependabot.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,32 @@ registries:
44
type: maven-repository
55
url: https://repo.spring.io/milestone
66
updates:
7+
- package-ecosystem: gradle
8+
target-branch: 6.5.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.apache.directory.shared:*
23+
- dependency-name: org.junit:junit-bom
24+
update-types:
25+
- version-update:semver-major
26+
- dependency-name: org.mockito:mockito-bom
27+
update-types:
28+
- version-update:semver-major
29+
- dependency-name: '*'
30+
update-types:
31+
- version-update:semver-major
32+
- version-update:semver-minor
733
- package-ecosystem: gradle
834
target-branch: 6.4.x
935
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.4.x, 6.3.x ]
14+
branch: [ main, 6.5.x, 6.4.x, 6.3.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.5. Please update your schema declarations to the 6.5 schema.",
99+
+ "with Spring Security 7.0. Please update your schema declarations to the 7.0 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\\.5.*.xsd.*")
224+
return schemaLocation.matches("(?m).*spring-security-7\\.0.*.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.5.xsd
17+
http\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-7.0.xsd
18+
http\://www.springframework.org/schema/security/spring-security-7.0.xsd=org/springframework/security/config/spring-security-7.0.xsd
1819
http\://www.springframework.org/schema/security/spring-security-6.5.xsd=org/springframework/security/config/spring-security-6.5.xsd
1920
http\://www.springframework.org/schema/security/spring-security-6.4.xsd=org/springframework/security/config/spring-security-6.4.xsd
2021
http\://www.springframework.org/schema/security/spring-security-6.3.xsd=org/springframework/security/config/spring-security-6.3.xsd
@@ -41,7 +42,8 @@ http\://www.springframework.org/schema/security/spring-security-2.0.xsd=org/spri
4142
http\://www.springframework.org/schema/security/spring-security-2.0.1.xsd=org/springframework/security/config/spring-security-2.0.1.xsd
4243
http\://www.springframework.org/schema/security/spring-security-2.0.2.xsd=org/springframework/security/config/spring-security-2.0.2.xsd
4344
http\://www.springframework.org/schema/security/spring-security-2.0.4.xsd=org/springframework/security/config/spring-security-2.0.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.xsd=org/springframework/security/config/spring-security-7.0.xsd
46+
https\://www.springframework.org/schema/security/spring-security-7.0.xsd=org/springframework/security/config/spring-security-7.0.xsd
4547
https\://www.springframework.org/schema/security/spring-security-6.5.xsd=org/springframework/security/config/spring-security-6.5.xsd
4648
https\://www.springframework.org/schema/security/spring-security-6.4.xsd=org/springframework/security/config/spring-security-6.4.xsd
4749
https\://www.springframework.org/schema/security/spring-security-6.3.xsd=org/springframework/security/config/spring-security-6.3.xsd

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

Lines changed: 1355 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)