Skip to content

Commit c24f25c

Browse files
Address SessionLimitStrategy
Closes gh-16206
1 parent 9b12bce commit c24f25c

File tree

118 files changed

+1702
-785
lines changed

Some content is hidden

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

118 files changed

+1702
-785
lines changed

.github/dependabot.template.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,5 @@ updates:
3636
schedule:
3737
interval: weekly
3838
ignore:
39-
- dependency-name: "sjohnr/*"
4039
- dependency-name: "spring-io/*"
4140
- dependency-name: "spring-security-release-tools/*"

.github/dependabot.yml

Lines changed: 2 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,7 @@ registries:
55
url: https://repo.spring.io/milestone
66
updates:
77
- package-ecosystem: gradle
8-
target-branch: 5.8.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
32-
- package-ecosystem: gradle
33-
target-branch: 6.2.x
8+
target-branch: 6.4.x
349
directory: /
3510
schedule:
3611
interval: daily
@@ -109,17 +84,7 @@ updates:
10984
- version-update:semver-major
11085

11186
- package-ecosystem: github-actions
112-
target-branch: 5.8.x
113-
directory: /
114-
schedule:
115-
interval: weekly
116-
labels:
117-
- 'type: task'
118-
- 'in: build'
119-
ignore:
120-
- dependency-name: sjohnr/*
121-
- package-ecosystem: github-actions
122-
target-branch: 6.2.x
87+
target-branch: 6.4.x
12388
directory: /
12489
schedule:
12590
interval: weekly
@@ -146,8 +111,6 @@ updates:
146111
labels:
147112
- 'type: task'
148113
- 'in: build'
149-
ignore:
150-
- dependency-name: sjohnr/*
151114
- package-ecosystem: github-actions
152115
target-branch: docs-build
153116
directory: /
@@ -156,8 +119,6 @@ updates:
156119
labels:
157120
- 'type: task'
158121
- 'in: build'
159-
ignore:
160-
- dependency-name: sjohnr/*
161122

162123
- package-ecosystem: npm
163124
target-branch: docs-build
@@ -184,19 +145,3 @@ updates:
184145
labels:
185146
- 'type: task'
186147
- 'in: build'
187-
- package-ecosystem: npm
188-
target-branch: 6.2.x
189-
directory: /docs
190-
schedule:
191-
interval: weekly
192-
labels:
193-
- 'type: task'
194-
- 'in: build'
195-
- package-ecosystem: npm
196-
target-branch: 5.8.x
197-
directory: /docs
198-
schedule:
199-
interval: weekly
200-
labels:
201-
- 'type: task'
202-
- 'in: build'

.github/workflows/continuous-integration-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
workflow_dispatch: # Manual trigger
1010

1111
env:
12-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
12+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
1313

1414
permissions:
1515
contents: read

.github/workflows/dependabot-auto-merge-forward.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
id: run-auto-merge-forward
3939
uses: spring-io/spring-security-release-tools/.github/actions/auto-merge-forward@actions-v1
4040
with:
41-
branches: 5.8.x,${{ needs.get-supported-branches.outputs.supported_versions }},main
41+
branches: ${{ needs.get-supported-branches.outputs.supported_versions }},main
4242
from-author: dependabot[bot]
4343
notify_result:
4444
name: Check for failures

.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/spring-security-config.gradle

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ dependencies {
122122
exclude group: "org.slf4j", module: "jcl-over-slf4j"
123123
}
124124
testImplementation libs.org.instancio.instancio.junit
125+
testImplementation libs.org.eclipse.jetty.jetty.server
126+
testImplementation libs.org.eclipse.jetty.jetty.servlet
125127

126128
testRuntimeOnly 'org.hsqldb:hsqldb'
127129
}
@@ -170,6 +172,17 @@ configure(project.tasks.withType(Test)) {
170172
}
171173
}
172174

175+
test {
176+
onOutput { descriptor, event ->
177+
if (!project.hasProperty('serialization')) {
178+
return
179+
}
180+
if (descriptor.name=='listClassesMissingSerialVersion()') {
181+
logger.lifecycle(event.message)
182+
}
183+
}
184+
}
185+
173186
tasks.register("opensaml5Test", Test) {
174187
filter {
175188
includeTestsMatching "org.springframework.security.config.annotation.web.configurers.saml2.*"

0 commit comments

Comments
 (0)