Skip to content

Commit 34cb9ab

Browse files
leewin12leewin12
authored
Merge branch 'spring-projects:main' into main
2 parents 2d3d7a0 + 4aed679 commit 34cb9ab

File tree

309 files changed

+15233
-6570
lines changed

Some content is hidden

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

309 files changed

+15233
-6570
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@
1515
*.otg binary
1616
*.png binary
1717
*.hsx binary
18+
*.serialized binary

‎.github/dependabot.template.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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: "sjohnr/*"

‎.github/dependabot.yml

Lines changed: 126 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,141 @@
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: 319 # 6.2.x
13-
directory: "/"
7+
- package-ecosystem: gradle
8+
target-branch: 5.8.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.1.x"
34-
milestone: 318 # 6.1.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.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.1.x
34+
directory: /
3635
schedule:
37-
interval: "daily"
38-
time: "03:00"
39-
timezone: "Etc/UTC"
40-
labels: [ "type: dependency-upgrade" ]
36+
interval: daily
37+
time: '03:00'
38+
timezone: Etc/UTC
39+
labels:
40+
- 'type: dependency-upgrade'
41+
registries:
42+
- spring-milestones
43+
ignore:
44+
- dependency-name: com.nimbusds:nimbus-jose-jwt
45+
- dependency-name: org.python:jython
46+
- dependency-name: org.apache.directory.server:*
47+
- dependency-name: org.junit:junit-bom
48+
update-types:
49+
- version-update:semver-major
50+
- dependency-name: org.mockito:mockito-bom
51+
update-types:
52+
- version-update:semver-major
53+
- dependency-name: '*'
54+
update-types:
55+
- version-update:semver-major
56+
- version-update:semver-minor
57+
- package-ecosystem: gradle
58+
target-branch: 6.2.x
59+
directory: /
60+
schedule:
61+
interval: daily
62+
time: '03:00'
63+
timezone: Etc/UTC
64+
labels:
65+
- 'type: dependency-upgrade'
66+
registries:
67+
- spring-milestones
68+
ignore:
69+
- dependency-name: com.nimbusds:nimbus-jose-jwt
70+
- dependency-name: org.python:jython
71+
- dependency-name: org.apache.directory.server:*
72+
- dependency-name: org.junit:junit-bom
73+
update-types:
74+
- version-update:semver-major
75+
- dependency-name: org.mockito:mockito-bom
76+
update-types:
77+
- version-update:semver-major
78+
- dependency-name: '*'
79+
update-types:
80+
- version-update:semver-major
81+
- version-update:semver-minor
82+
- package-ecosystem: gradle
83+
target-branch: main
84+
directory: /
85+
schedule:
86+
interval: daily
87+
time: '03:00'
88+
timezone: Etc/UTC
89+
labels:
90+
- 'type: dependency-upgrade'
91+
registries:
92+
- spring-milestones
93+
ignore:
94+
- dependency-name: com.nimbusds:nimbus-jose-jwt
95+
- dependency-name: org.python:jython
96+
- dependency-name: org.apache.directory.server:*
97+
- dependency-name: org.junit:junit-bom
98+
update-types:
99+
- version-update:semver-major
100+
- dependency-name: org.mockito:mockito-bom
101+
update-types:
102+
- version-update:semver-major
103+
- dependency-name: '*'
104+
update-types:
105+
- version-update:semver-major
106+
- version-update:semver-minor
107+
- package-ecosystem: github-actions
108+
target-branch: 5.8.x
109+
directory: /
110+
schedule:
111+
interval: weekly
112+
ignore:
113+
- dependency-name: sjohnr/*
114+
- package-ecosystem: github-actions
115+
target-branch: 6.1.x
116+
directory: /
117+
schedule:
118+
interval: weekly
119+
ignore:
120+
- dependency-name: sjohnr/*
121+
- package-ecosystem: github-actions
122+
target-branch: 6.2.x
123+
directory: /
124+
schedule:
125+
interval: weekly
41126
ignore:
42-
- dependency-name: "com.nimbusds:nimbus-jose-jwt" # nimbus-jose-jwt gets updated when oauth2-oidc-sdk is updated to ensure consistency
43-
- dependency-name: "org.python:jython" # jython updates break integration tests
44-
- dependency-name: "org.apache.directory.server:*" # ApacheDS version > 1.5.5 contains break changes
45-
- dependency-name: "org.junit:junit-bom"
46-
update-types: [ "version-update:semver-major" ]
47-
- dependency-name: "org.mockito:mockito-bom"
48-
update-types: [ "version-update:semver-major" ]
49-
- dependency-name: "*"
50-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
51-
52-
- package-ecosystem: "gradle"
53-
target-branch: "6.0.x"
54-
milestone: 143 # 6.0.x
55-
directory: "/"
127+
- dependency-name: sjohnr/*
128+
- package-ecosystem: github-actions
129+
target-branch: main
130+
directory: /
56131
schedule:
57-
interval: "daily"
58-
time: "03:00"
59-
timezone: "Etc/UTC"
60-
labels: [ "type: dependency-upgrade" ]
132+
interval: weekly
61133
ignore:
62-
- dependency-name: "com.nimbusds:nimbus-jose-jwt" # nimbus-jose-jwt gets updated when oauth2-oidc-sdk is updated to ensure consistency
63-
- dependency-name: "org.python:jython" # jython updates break integration tests
64-
- dependency-name: "org.apache.directory.server:*" # ApacheDS version > 1.5.5 contains break changes
65-
- dependency-name: "org.junit:junit-bom"
66-
update-types: [ "version-update:semver-major" ]
67-
- dependency-name: "org.mockito:mockito-bom"
68-
update-types: [ "version-update:semver-major" ]
69-
- dependency-name: "*"
70-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
71-
72-
- package-ecosystem: "gradle"
73-
target-branch: "5.8.x"
74-
milestone: 246 # 5.8.x
75-
directory: "/"
134+
- dependency-name: sjohnr/*
135+
- package-ecosystem: github-actions
136+
target-branch: docs-build
137+
directory: /
76138
schedule:
77-
interval: "daily"
78-
time: "03:00"
79-
timezone: "Etc/UTC"
80-
labels: [ "type: dependency-upgrade" ]
139+
interval: weekly
81140
ignore:
82-
- dependency-name: "com.nimbusds:nimbus-jose-jwt" # nimbus-jose-jwt gets updated when oauth2-oidc-sdk is updated to ensure consistency
83-
- dependency-name: "org.python:jython" # jython updates break integration tests
84-
- dependency-name: "org.apache.directory.server:*" # ApacheDS version > 1.5.5 contains break changes
85-
- dependency-name: "io.mockk:mockk" # mockk updates break tests
86-
- dependency-name: "org.opensaml:*" # org.opensaml maintains two different versions, so it must be updated manually
87-
- dependency-name: "org.junit:junit-bom"
88-
update-types: [ "version-update:semver-major" ]
89-
- dependency-name: "org.mockito:mockito-bom"
90-
update-types: [ "version-update:semver-major" ]
91-
- dependency-name: "*"
92-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
141+
- dependency-name: sjohnr/*

0 commit comments

Comments
 (0)