Skip to content

Commit b77ea8d

Browse files
committed
Update to 7.1.0-SNAPSHOT
1 parent e9a92a8 commit b77ea8d

222 files changed

Lines changed: 5287 additions & 100 deletions

File tree

Some content is hidden

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

.github/dependabot.yml

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ updates:
6363
- version-update:semver-minor
6464

6565
- package-ecosystem: gradle
66-
target-branch: main
66+
target-branch: 7.0.x
6767
directory: /
6868
schedule:
6969
interval: daily
@@ -94,6 +94,37 @@ updates:
9494
- version-update:semver-major
9595
- version-update:semver-minor
9696

97+
- package-ecosystem: gradle
98+
target-branch: main
99+
directory: /
100+
schedule:
101+
interval: daily
102+
time: '03:00'
103+
timezone: Etc/UTC
104+
labels:
105+
- 'type: dependency-upgrade'
106+
registries:
107+
- spring-milestones
108+
- shibboleth
109+
ignore:
110+
- dependency-name: com.nimbusds:nimbus-jose-jwt
111+
- dependency-name: org.python:jython
112+
- dependency-name: org.apache.directory.server:*
113+
- dependency-name: org.apache.directory.shared:*
114+
- dependency-name: org.junit:junit-bom
115+
update-types:
116+
- version-update:semver-major
117+
- dependency-name: org.mockito:mockito-bom
118+
update-types:
119+
- version-update:semver-major
120+
- dependency-name: com.gradle.enterprise
121+
update-types:
122+
- version-update:semver-major
123+
- version-update:semver-minor
124+
- dependency-name: '*'
125+
update-types:
126+
- version-update:semver-major
127+
97128
- package-ecosystem: npm
98129
target-branch: docs-build
99130
directory: /
@@ -111,3 +142,30 @@ updates:
111142
labels:
112143
- 'type: task'
113144
- 'in: build'
145+
146+
- package-ecosystem: 7.0.x
147+
target-branch: main
148+
directory: /docs
149+
schedule:
150+
interval: weekly
151+
labels:
152+
- 'type: task'
153+
- 'in: build'
154+
155+
- package-ecosystem: 6.5.x
156+
target-branch: main
157+
directory: /docs
158+
schedule:
159+
interval: weekly
160+
labels:
161+
- 'type: task'
162+
- 'in: build'
163+
164+
- package-ecosystem: 6.4.x
165+
target-branch: main
166+
directory: /docs
167+
schedule:
168+
interval: weekly
169+
labels:
170+
- 'type: task'
171+
- 'in: build'

.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.5.x, 6.4.x, 6.3.x ]
14+
branch: [ main, 7.0.x, 6.5.x, 6.4.x, 6.3.x ]
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout

.github/workflows/update-antora-ui-spring.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Update on Supported Branches
1717
strategy:
1818
matrix:
19-
branch: [ '6.4.x', '6.5.x', 'main' ]
19+
branch: [ '6.4.x', '6.5.x', '7.0.x' 'main' ]
2020
steps:
2121
- uses: spring-io/spring-doc-actions/update-antora-spring-ui@e28269199d1d27975cf7f65e16d6095c555b3cd0
2222
name: Update

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private static String configVersion() {
9494
public BeanDefinition parse(Element element, ParserContext pc) {
9595
if (!namespaceMatchesVersion(element)) {
9696
pc.getReaderContext()
97-
.fatal("You cannot use any XSD older than spring-security-7.0.xsd. Either change to spring-security.xsd or spring-security-7.0.xsd",
97+
.fatal("You cannot use any XSD older than spring-security-7.1.xsd. Either change to spring-security.xsd or spring-security-7.1.xsd",
9898
element);
9999
}
100100
String name = pc.getDelegate().getLocalName(element);
@@ -219,7 +219,7 @@ private boolean namespaceMatchesVersion(Element element) {
219219

220220
private boolean matchesVersionInternal(Element element) {
221221
String schemaLocation = element.getAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "schemaLocation");
222-
return schemaLocation.matches("(?m).*spring-security-7\\.0.*.xsd.*")
222+
return schemaLocation.matches("(?m).*spring-security-7\\.1.*.xsd.*")
223223
|| schemaLocation.matches("(?m).*spring-security.xsd.*")
224224
|| !schemaLocation.matches("(?m).*spring-security.*");
225225
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +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-7.1.xsd
18+
http\://www.springframework.org/schema/security/spring-security-7.0.xsd=org/springframework/security/config/spring-security-7.1.xsd
1719
http\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-7.0.xsd
1820
http\://www.springframework.org/schema/security/spring-security-7.0.xsd=org/springframework/security/config/spring-security-7.0.xsd
1921
http\://www.springframework.org/schema/security/spring-security-6.5.xsd=org/springframework/security/config/spring-security-6.5.xsd
@@ -42,7 +44,8 @@ http\://www.springframework.org/schema/security/spring-security-2.0.xsd=org/spri
4244
http\://www.springframework.org/schema/security/spring-security-2.0.1.xsd=org/springframework/security/config/spring-security-2.0.1.xsd
4345
http\://www.springframework.org/schema/security/spring-security-2.0.2.xsd=org/springframework/security/config/spring-security-2.0.2.xsd
4446
http\://www.springframework.org/schema/security/spring-security-2.0.4.xsd=org/springframework/security/config/spring-security-2.0.4.xsd
45-
https\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-7.0.xsd
47+
https\://www.springframework.org/schema/security/spring-security.xsd=org/springframework/security/config/spring-security-7.1.xsd
48+
https\://www.springframework.org/schema/security/spring-security-7.1.xsd=org/springframework/security/config/spring-security-7.1.xsd
4649
https\://www.springframework.org/schema/security/spring-security-7.0.xsd=org/springframework/security/config/spring-security-7.0.xsd
4750
https\://www.springframework.org/schema/security/spring-security-6.5.xsd=org/springframework/security/config/spring-security-6.5.xsd
4851
https\://www.springframework.org/schema/security/spring-security-6.4.xsd=org/springframework/security/config/spring-security-6.4.xsd

0 commit comments

Comments
 (0)