Phillip Webb
cd5d2decf9
Merge branch '4.0.x' into 4.1.x
...
Closes gh-51450
2026-08-25 12:43:03 -07:00
Phillip Webb
53c04499b4
Create properties despite used-defined ClientRegistrationRepository
...
Update `OAuth2ClientConfigurations` so that properties are created
regardless of a user-defined `ClientRegistrationRepository` bean.
Fixes gh-51447
2026-08-25 12:41:23 -07:00
Phillip Webb
40c527aeb0
Merge branch '4.0.x' into 4.1.x
...
Closes gh-51448
2026-08-25 12:39:46 -07:00
Phillip Webb
64267798cb
Merge pull request #51409 from msridhar
...
Closes gh-51409
* pr/51409:
Fix warning from NullAway 0.14.0 related to override
2026-08-25 12:39:36 -07:00
Manu Sridharan
23fc7dd183
Fix warning from NullAway 0.14.0 related to override
...
See gh-51409
Signed-off-by: Manu Sridharan <msridhar@gmail.com >
2026-08-25 12:29:02 -07:00
Phillip Webb
299c7d9125
Merge branch '4.0.x' into 4.1.x
...
Closes gh-51445
2026-08-25 12:08:53 -07:00
Phillip Webb
45b520f6c2
Merge pull request #51431 from CHISANW
...
Closes gh-51431
* pr/51431:
Fix typos in service connection documentation
2026-08-25 12:08:49 -07:00
chisanw
857d1b7a8a
Fix typos in service connection documentation
...
See gh-51431
Signed-off-by: chisanw <keuye06380618@gmail.com >
2026-08-25 12:07:13 -07:00
Phillip Webb
1e3261b58b
Merge branch '4.0.x' into 4.1.x
...
Closes gh-51443
2026-08-25 12:00:08 -07:00
Phillip Webb
a5e2fb3148
Merge pull request #51438 from MacAlsandair
...
Closes gh-51438
* pr/51438:
Remove duplicate adoc generation in DocumentAutoConfigurationClasses
2026-08-25 11:59:56 -07:00
Alexander Makarov
f76e3b6886
Remove duplicate adoc generation in DocumentAutoConfigurationClasses
...
The task loaded the auto-configuration metadata twice and wrote every
module's adoc file twice. When `load()` and `writeNavAdoc()` were
introduced, the pre-existing loop that read each metadata file and
called `writeModuleAdoc()` was left in place, so each file was
generated once from `load()` and then again, identically, by the loop.
Remove the redundant loop. The generated output is unchanged.
See gh-51438
Signed-off-by: Alexander Makarov <alexander.makarov@nightsong.li >
2026-08-25 11:58:25 -07:00
Phillip Webb
fcd2c9a98d
Merge pull request #51441 from 2heunxun
...
Closes gh-51441
* pr/51441:
Polish LdapHealthIndicator
Fix LdapHealthIndicator reporting when LDAP version is unavailable
2026-08-25 11:49:22 -07:00
Phillip Webb
014bbcca82
Polish LdapHealthIndicator
...
See gh-51441
2026-08-25 11:46:03 -07:00
2heunxun
d5ace369bd
Fix LdapHealthIndicator reporting when LDAP version is unavailable
...
Fix regression caused by commit d26b6895 which caused
`doHealthCheck()` to only call `builder.up()` when the LDAP
server's protocol version (`java.naming.ldap.version`) could be
read from the JNDI environment.
See gh-51441
Signed-off-by: 2heunxun <seapeon@naver.com >
2026-08-25 11:43:49 -07:00
Andy Wilkinson
67d7523f52
Account for length of Gradle version when relocating test kit dir
2026-08-25 09:26:59 +01:00
Andy Wilkinson
e33f3c6781
Expect deprecation warnings from Protobuf plugin
...
See gh-51428
2026-08-25 08:37:58 +01:00
Moritz Halbritter
ef58fa8080
Merge branch '4.0.x' into 4.1.x
...
Closes gh-51435
2026-08-25 09:20:21 +02:00
Moritz Halbritter
831b46ccf8
Merge pull request #51421 from MacAlsandair
...
Closes gh-51421
* pr/51421:
Document SAML2 back-off in WebFlux security documentation
2026-08-25 09:19:50 +02:00
Alexander Makarov
768308ec74
Document SAML2 back-off in WebFlux security documentation
...
See gh-51421
Signed-off-by: Alexander Makarov <alexander.makarov@nightsong.li >
2026-08-25 09:16:39 +02:00
Moritz Halbritter
7a77c35d75
Merge branch '4.0.x' into 4.1.x
...
Closes gh-51433
2026-08-25 09:14:42 +02:00
Moritz Halbritter
a39ed772d6
Merge pull request #51412 from 2heunxun
...
Closes gh-51412
* pr/51412:
Fix watchdog thread leak in JmsHealthIndicator on start failure
2026-08-25 09:13:47 +02:00
2heunxun
d00566ae5d
Fix watchdog thread leak in JmsHealthIndicator on start failure
...
See gh-51412
Signed-off-by: 2heunxun <seapeon@naver.com >
2026-08-25 09:07:25 +02:00
Phillip Webb
dfbda6fd13
Polish
2026-08-24 19:09:56 -07:00
Phillip Webb
e4870664f1
Merge branch '4.0.x' into 4.1.x
2026-08-24 19:09:52 -07:00
Phillip Webb
068bb037bf
Change code to make Eclipse compiler happy
...
Extract a local variable to fix compiler error that only seems to
happen in Eclipse.
2026-08-24 19:07:53 -07:00
Andy Wilkinson
b1454cd2de
Merge branch '4.0.x' into 4.1.x
2026-08-24 15:52:12 +01:00
Andy Wilkinson
6dbc7e9a51
Use method on String to identify Java 27
...
At the time of writing, https://javaalmanac.io lists
EnumSet.spliterator as being new in Java 27, but that's not the case.
This commit switches to using String.encodedLength(Charset) instead.
This method is new in Java 27 and also aligns with the existing
TWENTY_SIX value that already uses a method on String for version
identification.
See gh-51422
2026-08-24 15:47:34 +01:00
Andy Wilkinson
975c591a97
Merge branch '4.0.x' into 4.1.x
2026-08-24 15:31:45 +01:00
Andy Wilkinson
6e58a6ff8b
Polish
...
See gh-51422
2026-08-24 15:31:30 +01:00
Andy Wilkinson
ec28f8b530
Merge branch '4.0.x' into 4.1.x
...
Closes gh-51428
2026-08-24 15:24:59 +01:00
Andy Wilkinson
feb66aa843
Merge branch '4.0.x' into 4.1.x
...
Closes gh-51426
2026-08-24 15:21:55 +01:00
Andy Wilkinson
ee059ae3ca
Add CI for Java 27
...
Closes gh-51423
2026-08-24 14:52:36 +01:00
Andy Wilkinson
ff153f21d8
Add TWENTY_SEVEN to JavaVersion
...
Closes gh-51422
2026-08-24 14:51:52 +01:00
Stéphane Nicoll
cbaaa0fe45
Merge pull request #51410 from jjh75607
...
Closes gh-51410
* fix/unwrap-root-honours-wrapper-unwrap-41x:
Polish "Honor a wrapper's unwrap when resolving the root DataSource"
Honor a wrapper's unwrap when resolving the root DataSource
2026-08-24 10:50:04 +02:00
Stéphane Nicoll
d5cec292dc
Polish "Honor a wrapper's unwrap when resolving the root DataSource"
...
See gh-51410
2026-08-24 10:41:17 +02:00
jjh75607
5eb30621db
Honor a wrapper's unwrap when resolving the root DataSource
...
See gh-51410
Signed-off-by: jjh75607 <jjh7560734@gmail.com >
2026-08-24 10:38:51 +02:00
Stéphane Nicoll
4ee67a3f6b
Merge branch '4.0.x' into 4.1.x
...
Closes gh-51418
2026-08-24 08:26:06 +02:00
Stéphane Nicoll
43d3cf57eb
Close reader in GsonTester
...
This harmonizes how JSON marshaller testers operate on a stream. Also
added tests that checks the source is closed as expected for all
implementations.
Closes gh-51417
2026-08-24 08:21:51 +02:00
Stéphane Nicoll
515810853f
Merge branch '4.0.x' into 4.1.x
...
Closes gh-51415
2026-08-24 08:08:03 +02:00
Stéphane Nicoll
d3547de07b
Merge pull request #51398 from dlwldn30
...
Closes gh-51398
* close-aot-file-content-stream:
Polish "Release file handle when comparing AOT file content"
Release file handle when comparing AOT file content
2026-08-24 08:07:49 +02:00
Stéphane Nicoll
5402f5b43f
Polish "Release file handle when comparing AOT file content"
...
See gh-51398
2026-08-24 08:05:45 +02:00
dlwldn30
4a1abb9617
Release file handle when comparing AOT file content
...
RequireNewOrMatchingContentFileHandler reads the already generated file
through content.getInputStream().readAllBytes(). That method does not
close the stream, and the stream is never assigned, so it cannot
be closed at all.
During AOT processing the content is a FileSystemResource, so each
comparison leaks a file handle. FileSystemGeneratedFiles already uses
try-with-resources when it consumes an InputStreamSource.
Read the existing content inside a try-with-resources block.
See gh-51398
Signed-off-by: dlwldn30 <dlwldn30@naver.com >
2026-08-24 08:05:38 +02:00
Stéphane Nicoll
43a9d265b7
Merge branch '4.0.x' into 4.1.x
...
Closes gh-51413
2026-08-24 08:03:19 +02:00
Stéphane Nicoll
01267a3c6f
Merge pull request #51411 from MacAlsandair
...
Closes gh-51411
* docs-remove-springbootwebsecurityconfiguration-reference-4.0.x:
Polish
Remove reference to SpringBootWebSecurityConfiguration
2026-08-24 08:03:12 +02:00
Stéphane Nicoll
083b4d3f0e
Polish
...
See gh-51411
2026-08-24 08:01:15 +02:00
Alexander Makarov
13389a27e7
Remove reference to SpringBootWebSecurityConfiguration
...
Servlet web security moved to ServletWebSecurityAutoConfiguration, but
the MVC Security section still describes SecurityAutoConfiguration
importing SpringBootWebSecurityConfiguration, which no longer exists.
See gh-51411
Signed-off-by: Alexander Makarov <alexander.makarov@nightsong.li >
2026-08-24 07:57:21 +02:00
Stéphane Nicoll
c1bfdf0522
Merge branch '4.0.x' into 4.1.x
...
Closes gh-51406
2026-08-21 11:01:34 +02:00
Stéphane Nicoll
08b21900c4
Merge pull request #51393 from dependabot[bot]
...
Closes gh-51393
* dependabot/npm_and_yarn/antora/antora/cli-3.2.0-rc.3:
Bump @antora/cli from 3.2.0-rc.2 to 3.2.0-rc.3 in /antora
2026-08-21 11:01:31 +02:00
dependabot[bot]
19431312b6
Bump @antora/cli from 3.2.0-rc.2 to 3.2.0-rc.3 in /antora
...
Bumps [@antora/cli](https://gitlab.com/antora/antora ) from 3.2.0-rc.2 to 3.2.0-rc.3.
- [Changelog](https://gitlab.com/antora/antora/blob/main/CHANGELOG.adoc )
- [Commits](https://gitlab.com/antora/antora/compare/v3.2.0-rc.2...v3.2.0-rc.3 )
---
updated-dependencies:
- dependency-name: "@antora/cli"
dependency-version: 3.2.0-rc.3
dependency-type: direct:production
update-type: version-update:semver-patch
...
See gh-51393
Signed-off-by: dependabot[bot] <support@github.com >
2026-08-21 10:58:33 +02:00
Stéphane Nicoll
c516d6c3fe
Merge branch '4.0.x' into 4.1.x
...
Closes gh-51404
2026-08-21 10:54:47 +02:00