Skip to content

Commit 895a03e

Browse files
leshalvleshalv
authored
Merge branch 'spring-projects:main' into main
2 parents 744433b + fe9edc8 commit 895a03e

File tree

1,462 files changed

+111796
-17521
lines changed

Some content is hidden

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

1,462 files changed

+111796
-17521
lines changed

‎.github/dependabot.template.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
version: 2
2+
3+
registries:
4+
spring-milestones:
5+
type: maven-repository
6+
url: https://repo.spring.io/milestone
7+
8+
updates:
9+
10+
- package-ecosystem: "gradle"
11+
target-branch: "main"
12+
directory: "/"
13+
schedule:
14+
interval: "daily"
15+
time: "03:00"
16+
timezone: "Etc/UTC"
17+
labels: [ "type: dependency-upgrade" ]
18+
registries:
19+
- "spring-milestones"
20+
ignore:
21+
- dependency-name: "com.nimbusds:nimbus-jose-jwt" # nimbus-jose-jwt gets updated when oauth2-oidc-sdk is updated to ensure consistency
22+
- dependency-name: "org.python:jython" # jython updates break integration tests
23+
- dependency-name: "org.apache.directory.server:*" # ApacheDS version > 1.5.5 contains break changes
24+
- dependency-name: "org.junit:junit-bom"
25+
update-types: [ "version-update:semver-major" ]
26+
- dependency-name: "org.mockito:mockito-bom"
27+
update-types: [ "version-update:semver-major" ]
28+
- dependency-name: "*"
29+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
30+
31+
# GitHub Actions
32+
33+
- package-ecosystem: github-actions
34+
target-branch: "main"
35+
directory: "/"
36+
schedule:
37+
interval: weekly
38+
ignore:
39+
- dependency-name: "spring-io/*"
40+
- dependency-name: "spring-security-release-tools/*"

‎.github/dependabot.yml‎

Lines changed: 119 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,146 +1,150 @@
11
version: 2
2-
32
registries:
43
spring-milestones:
54
type: maven-repository
65
url: https://repo.spring.io/milestone
7-
86
updates:
9-
10-
- package-ecosystem: "gradle"
11-
target-branch: "main"
12-
milestone: 326 # 6.3.x
13-
directory: "/"
7+
- package-ecosystem: gradle
8+
target-branch: 6.4.x
9+
directory: /
1410
schedule:
15-
interval: "daily"
16-
time: "03:00"
17-
timezone: "Etc/UTC"
18-
labels: [ "type: dependency-upgrade" ]
11+
interval: daily
12+
time: '03:00'
13+
timezone: Etc/UTC
14+
labels:
15+
- 'type: dependency-upgrade'
1916
registries:
20-
- "spring-milestones"
17+
- spring-milestones
2118
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"
34-
milestone: 319 # 6.2.x
35-
directory: "/"
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
33+
- package-ecosystem: gradle
34+
target-branch: 6.3.x
35+
directory: /
3636
schedule:
37-
interval: "daily"
38-
time: "03:00"
39-
timezone: "Etc/UTC"
40-
labels: [ "type: dependency-upgrade" ]
37+
interval: daily
38+
time: '03:00'
39+
timezone: Etc/UTC
40+
labels:
41+
- 'type: dependency-upgrade'
4142
registries:
42-
- "spring-milestones"
43+
- spring-milestones
4344
ignore:
44-
- dependency-name: "com.nimbusds:nimbus-jose-jwt" # nimbus-jose-jwt gets updated when oauth2-oidc-sdk is updated to ensure consistency
45-
- dependency-name: "org.python:jython" # jython updates break integration tests
46-
- dependency-name: "org.apache.directory.server:*" # ApacheDS version > 1.5.5 contains break changes
47-
- dependency-name: "org.apache.directory.shared:*" # ApacheDS version > 0.9.15 contains breaking changes
48-
- dependency-name: "org.junit:junit-bom"
49-
update-types: [ "version-update:semver-major" ]
50-
- dependency-name: "org.mockito:mockito-bom"
51-
update-types: [ "version-update:semver-major" ]
52-
- dependency-name: "*"
53-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
54-
55-
- package-ecosystem: "gradle"
56-
target-branch: "6.1.x"
57-
milestone: 318 # 6.1.x
58-
directory: "/"
45+
- dependency-name: com.nimbusds:nimbus-jose-jwt
46+
- dependency-name: org.python:jython
47+
- dependency-name: org.apache.directory.server:*
48+
- dependency-name: org.apache.directory.shared:*
49+
- dependency-name: org.junit:junit-bom
50+
update-types:
51+
- version-update:semver-major
52+
- dependency-name: org.mockito:mockito-bom
53+
update-types:
54+
- version-update:semver-major
55+
- dependency-name: '*'
56+
update-types:
57+
- version-update:semver-major
58+
- version-update:semver-minor
59+
- package-ecosystem: gradle
60+
target-branch: main
61+
directory: /
5962
schedule:
60-
interval: "daily"
61-
time: "03:00"
62-
timezone: "Etc/UTC"
63-
labels: [ "type: dependency-upgrade" ]
64-
ignore:
65-
- dependency-name: "com.nimbusds:nimbus-jose-jwt" # nimbus-jose-jwt gets updated when oauth2-oidc-sdk is updated to ensure consistency
66-
- dependency-name: "org.python:jython" # jython updates break integration tests
67-
- dependency-name: "org.apache.directory.server:*" # ApacheDS version > 1.5.5 contains break changes
68-
- dependency-name: "org.junit:junit-bom"
69-
update-types: [ "version-update:semver-major" ]
70-
- dependency-name: "org.mockito:mockito-bom"
71-
update-types: [ "version-update:semver-major" ]
72-
- dependency-name: "*"
73-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
74-
75-
- package-ecosystem: "gradle"
76-
target-branch: "5.8.x"
77-
milestone: 246 # 5.8.x
78-
directory: "/"
79-
schedule:
80-
interval: "daily"
81-
time: "03:00"
82-
timezone: "Etc/UTC"
83-
labels: [ "type: dependency-upgrade" ]
63+
interval: daily
64+
time: '03:00'
65+
timezone: Etc/UTC
66+
labels:
67+
- 'type: dependency-upgrade'
68+
registries:
69+
- spring-milestones
8470
ignore:
85-
- dependency-name: "com.nimbusds:nimbus-jose-jwt" # nimbus-jose-jwt gets updated when oauth2-oidc-sdk is updated to ensure consistency
86-
- dependency-name: "org.python:jython" # jython updates break integration tests
87-
- dependency-name: "org.apache.directory.server:*" # ApacheDS version > 1.5.5 contains break changes
88-
- dependency-name: "io.mockk:mockk" # mockk updates break tests
89-
- dependency-name: "org.opensaml:*" # org.opensaml maintains two different versions, so it must be updated manually
90-
- dependency-name: "org.junit:junit-bom"
91-
update-types: [ "version-update:semver-major" ]
92-
- dependency-name: "org.mockito:mockito-bom"
93-
update-types: [ "version-update:semver-major" ]
94-
- dependency-name: "*"
95-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
96-
97-
- package-ecosystem: "gradle"
98-
target-branch: "docs-build"
99-
directory: "/"
100-
schedule:
101-
interval: "daily"
102-
time: "03:00"
103-
timezone: "Etc/UTC"
104-
labels: [ "type: dependency-upgrade" ]
105-
106-
# GitHub Actions
71+
- dependency-name: com.nimbusds:nimbus-jose-jwt
72+
- dependency-name: org.python:jython
73+
- dependency-name: org.apache.directory.server:*
74+
- dependency-name: org.apache.directory.shared:*
75+
- dependency-name: org.junit:junit-bom
76+
update-types:
77+
- version-update:semver-major
78+
- dependency-name: org.mockito:mockito-bom
79+
update-types:
80+
- version-update:semver-major
81+
- dependency-name: com.gradle.enterprise
82+
update-types:
83+
- version-update:semver-major
84+
- version-update:semver-minor
85+
- dependency-name: '*'
86+
update-types:
87+
- version-update:semver-major
10788

10889
- package-ecosystem: github-actions
109-
target-branch: "main"
110-
milestone: 326 # 6.3.x
111-
directory: "/"
90+
target-branch: 6.4.x
91+
directory: /
11292
schedule:
11393
interval: weekly
94+
labels:
95+
- 'type: task'
96+
- 'in: build'
11497
ignore:
115-
- dependency-name: "sjohnr/*"
98+
- dependency-name: sjohnr/*
11699
- package-ecosystem: github-actions
117-
target-branch: "6.2.x"
118-
milestone: 319 # 6.2.x
119-
directory: "/"
100+
target-branch: 6.3.x
101+
directory: /
120102
schedule:
121103
interval: weekly
104+
labels:
105+
- 'type: task'
106+
- 'in: build'
122107
ignore:
123-
- dependency-name: "sjohnr/*"
108+
- dependency-name: sjohnr/*
124109
- package-ecosystem: github-actions
125-
target-branch: "6.1.x"
126-
milestone: 318 # 6.1.x
127-
directory: "/"
110+
target-branch: main
111+
directory: /
128112
schedule:
129113
interval: weekly
130-
ignore:
131-
- dependency-name: "sjohnr/*"
114+
labels:
115+
- 'type: task'
116+
- 'in: build'
132117
- package-ecosystem: github-actions
133-
target-branch: "5.8.x"
134-
milestone: 246 # 5.8.x
135-
directory: "/"
118+
target-branch: docs-build
119+
directory: /
136120
schedule:
137121
interval: weekly
138-
ignore:
139-
- dependency-name: "sjohnr/*"
140-
- package-ecosystem: github-actions
141-
target-branch: "docs-build"
142-
directory: "/"
122+
labels:
123+
- 'type: task'
124+
- 'in: build'
125+
126+
- package-ecosystem: npm
127+
target-branch: docs-build
128+
directory: /
143129
schedule:
144130
interval: weekly
145-
ignore:
146-
- dependency-name: "sjohnr/*"
131+
labels:
132+
- 'type: task'
133+
- 'in: build'
134+
135+
- package-ecosystem: npm
136+
target-branch: main
137+
directory: /docs
138+
schedule:
139+
interval: weekly
140+
labels:
141+
- 'type: task'
142+
- 'in: build'
143+
- package-ecosystem: npm
144+
target-branch: 6.3.x
145+
directory: /docs
146+
schedule:
147+
interval: weekly
148+
labels:
149+
- 'type: task'
150+
- 'in: build'

0 commit comments

Comments
 (0)