spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity
62,363 Commits 24 Branches 394 Tags
7538153cc15a0bc63f15633925a955dd2adfc2c4
Commit Graph
62363 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Webb 7538153cc1 Merge branch '4.1.x' 
Closes gh-51451
 2026-08-25 12:43:08 -07:00
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 64dd438bb8 Merge branch '4.1.x' 
Closes gh-51449
 2026-08-25 12:39:52 -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 42f06537c1 Merge branch '4.1.x' 
Closes gh-51446
 2026-08-25 12:08:57 -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 6ffeededd9 Merge branch '4.1.x' 
Closes gh-51444
 2026-08-25 12:00:16 -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 ca0772effd Merge branch '4.1.x' 
Closes gh-51442
 2026-08-25 11:49:40 -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
Moritz Halbritter b4042f891b Merge pull request #50595 from philsttr 
Closes gh-50595

* pr/50595:
  Polish "Allow configuring Micrometer Tracing MDC keys"
  Allow configuring Micrometer Tracing MDC keys
 2026-08-25 13:54:32 +02:00
Moritz Halbritter 3f7cebd802 Polish "Allow configuring Micrometer Tracing MDC keys" 
Derive logging.pattern.correlation from the configured MDC keys so that
log correlation keeps working when the keys are customized, instead of
silently rendering a blank correlation field.

Reject empty MDC keys and only clear Brave's default correlation fields
when the keys have been customized, so that applications using the
defaults are unaffected if Brave adds a default field.

Replace the tests that asserted on bean wiring with integration tests
covering the MDC contents, plus a smoke test for the log output.

See gh-50595
 2026-08-25 13:54:00 +02:00
Phil Clay dc2274e5b6 Allow configuring Micrometer Tracing MDC keys 
See gh-50595

Signed-off-by: Phil Clay <philsttr@users.noreply.github.com>
 2026-08-25 13:51:28 +02:00
Andy Wilkinson 7780b5fe86 Merge branch '4.1.x' 2026-08-25 09:27:18 +01: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 f6d986d0bd Merge branch '4.1.x' 2026-08-25 08:38:29 +01:00
Andy Wilkinson e33f3c6781 Expect deprecation warnings from Protobuf plugin 
See gh-51428
 2026-08-25 08:37:58 +01:00
Moritz Halbritter 35cde22149 Merge branch '4.1.x' 
Closes gh-51436
 2026-08-25 09:20:30 +02: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 16445f82a6 Merge branch '4.1.x' 
Closes gh-51434
 2026-08-25 09:14:57 +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
Moritz Halbritter 7a6be52eae Polish 
See gh-50461
 2026-08-25 08:45:47 +02:00
Phillip Webb e694cf15d9 Polish 2026-08-24 19:10:38 -07:00
Phillip Webb 6c81a602ab Merge branch '4.1.x' 2026-08-24 19:10:29 -07: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 59ec1f0de7 Merge branch '4.1.x' 2026-08-24 15:52:25 +01: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 5289c755f5 Merge branch '4.1.x' 2026-08-24 15:31:53 +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 87430a4c5f Merge branch '4.1.x' 
Closes gh-51429
 2026-08-24 15:25:19 +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 5b5363ff44 Merge branch '4.1.x' 
Closes gh-51427
 2026-08-24 15:22:24 +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