59 Commits
Author SHA1 Message Date
Andy Wilkinson bc72f228c3 Merge branch '4.1.x'
Closes gh-51764
2026-09-15 13:03:19 +01:00
Hyunwoo Jung ed63da9f5d Fix duplicated tests
Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>

See gh-51722
2026-09-15 12:48:22 +01:00
Stéphane Nicoll 58b8ce6cca Merge branch '4.1.x'
Closes gh-51721
2026-09-13 17:21:31 +02:00
Tran Ngoc Nhan 338ac4b490 Remove unnecessary backtick in author tag
See gh-51719

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2026-09-13 17:14:27 +02:00
Andy Wilkinson 57b44b0594 Merge branch '4.1.x'
Closes gh-51600
2026-09-07 08:27:14 +01:00
Manu Sridharan 25a3f8feb9 Remove unnecessary NullAway suppressions
Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-51591
2026-09-07 08:18:11 +01:00
Phillip Webb ef4f1404a1 Merge branch '4.1.x'
Closes gh-51455
2026-08-25 14:19:47 -07:00
Phillip Webb 5a21e0d698 Upgrade to spring-javaformat 0.0.48
Closes gh-51452
2026-08-25 13:58:58 -07:00
Stéphane Nicoll e7741bf152 Start building against Spring Framework 7.1.0-M1 snapshots
See gh-51123
2026-07-27 21:16:50 +02:00
Stéphane Nicoll 07f80348a5 Polish "Remove APIs that were deprecated for removal in 4.2"
See gh-50955
2026-07-24 15:57:23 +02:00
Venkata Naga Sai Srikanth Gollapudi 87c4755a86 Harmonize use of Collections and Maps in configuration properties
See gh-50367

Signed-off-by: Venkata Naga Sai Srikanth Gollapudi <42247688+gollapudisrikanth@users.noreply.github.com>
2026-07-15 11:37:31 +02:00
Andy Wilkinson 81aa1367f5 Polish "Remove unnecessary @Nullables from local array variable declarations"
See gh-50881

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-06-29 10:29:10 +01:00
Yanming Zhou 9d5c98b7e9 Replace isAssignableFrom() with isInstance() where feasible
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

See gh-50750
2026-06-24 19:11:59 +01:00
Andy Wilkinson add52b6ccd Merge branch '3.5.x' into 4.0.x
Closes gh-50439
2026-05-14 15:02:24 +01:00
Phillip Webb 4283e59ab4 Merge branch '3.5.x' into 4.0.x
Closes gh-50416
2026-05-12 18:10:38 -07:00
Phillip Webb fb67890c44 Merge branch '3.5.x' into 4.0.x
Closes gh-50411
2026-05-12 12:31:16 -07:00
Lee JiWon e3058d849b Fix self-referential parentId in MappingsEndpoint
The mappings endpoint reported the context's own id as `parentId`
instead of the parent context's id, preventing clients from
reconstructing the context hierarchy from the response. Align with
sibling endpoints (`BeansEndpoint`,
`ConfigurationPropertiesReportEndpoint`, `ConditionsReportEndpoint`)
which already use `parent.getId()`.

See gh-50373

Signed-off-by: Lee JiWon <dlwldnjs1009@gmail.com>
2026-05-12 12:26:19 -07:00
Stéphane Nicoll 308c4317e0 Merge branch '3.5.x' into 4.0.x 2026-04-08 07:31:30 +02:00
Stéphane Nicoll d7a475fcd9 Merge branch '3.5.x' into 4.0.x
Closes gh-49946
2026-04-07 17:33:38 +02:00
Yanming Zhou 664467563b Remove empty package "org.springframework.boot.actuate.data"
See gh-49741

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2026-03-24 19:02:20 -07:00
Phillip Webb e8ec285fd5 Merge branch '3.5.x' into 4.0.x
Closes gh-49736
2026-03-24 17:39:33 -07:00
Andy Wilkinson 5826200520 Delay removal of Jackson 2 support until 4.3.0 at the earliest
Closes gh-49010
2026-01-28 13:52:00 +00:00
Tran Ngoc Nhan d00cb0b282 Allow Info to be built with null map values
See gh-48480

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-12-09 10:47:42 -08:00
Phillip Webb 1573104dfc Allow Info to be built with null map values
Fixes gh-48401
2025-12-08 11:55:37 -08:00
Stéphane Nicoll a98b36efbb Start building against Spring Framework 7.0.2 snapshots
See gh-48439
2025-12-08 14:54:53 +01:00
Phillip Webb 2639d1ead5 Allow Info to be built with null values
Fixes gh-48401
2025-12-05 13:11:54 -08:00
Phillip Webb e93f9c313c Guard against WebServerApplicationContext not being present
Update security matchers and WebFlux actuator support to guard against
the `WebServerApplicationContext` class not being present.

Fixes gh-48388
2025-12-03 22:41:32 -08:00
Stéphane Nicoll d1e5fe3248 Merge branch '3.5.x'
Closes gh-48106
2025-11-13 10:31:25 +01:00
Phillip WebbandAndy Wilkinson 619454548b Restore support for Jersey
Restore support for Jersey now that it supports JAX-RS 4.

Closes gh-47967

Co-authored-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2025-11-05 10:51:08 -08:00
Andy Wilkinson 4e94f26935 Support JMX endpoints when only Jackson 2 is present
Closes gh-47688
2025-10-22 14:40:59 +01:00
Yanming Zhou 609b0b444e Use JsonMapper instead of ObjectMapper where feasible
See gh-47503

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-10-20 13:16:52 +02:00
Phillip Webb 183d765b4d Support actuator with Jackson 2 only
See gh-47688
2025-10-17 13:17:19 -07:00
Phillip Webb 34e0382858 Move actuator heath code to spring-boot-health
Closes gh-46357
2025-10-14 21:51:24 -07:00
Phillip Webb 5d21b822ab Remove unnecessary spring-boot-http-converter dependency
Remove unnecessary spring-boot-http-converter dependency from
`spring-boot-actuator`.

See gh-46357
2025-10-14 21:51:24 -07:00
Phillip Webb 1bad1b781a Drop unnecessary jsonb dependency from spring-boot-actuator
See gh-46357
2025-10-14 21:51:24 -07:00
Phillip Webb 229e9849a6 Drop spring-boot-validation from spring-boot-actuator
Remove the validation dependency since it was only used for tests and
we can wire things up directly instead.

See gh-46357
2025-10-14 21:51:24 -07:00
Phillip Webb 03161bcbb8 Move web-server to test fixtures dependency
See gh-46357
2025-10-14 21:51:24 -07:00
Phillip Webb e01b36216a Revert Support pluggable types for EndpointJsonMapper
Closes gh-46534
2025-10-09 22:48:45 -07:00
Andy Wilkinson da74dd92c9 Merge branch '3.5.x'
Closes gh-47439
2025-10-09 10:59:17 +01:00
Moritz Halbritter 9bb62a074b Add nullability annotations to tests in module/spring-boot-actuator
See gh-47263
2025-10-02 11:59:32 +02:00
Phillip Webb 8008076e04 Remove spring-boot-json-test module
Remove spring-boot-json-test module and spread code between
`spring-boot-test`, `spring-boot-test-autoconfigure` and JSON
technology modules.

See gh-46356
See gh-47322
2025-10-01 21:42:18 -07:00
Andy Wilkinson 0b601118bd Modularize spring-boot-test
Closes gh-46356
2025-09-25 17:24:12 +01:00
Andy Wilkinson 51b606e941 Polish 2025-09-24 12:47:09 +01:00
Moritz Halbritter 641b72db65 Make SanitizableData.key non-nullable
Closes gh-47220
2025-09-16 08:48:01 +02:00
Andy Wilkinson 2dc80b4047 Move Prometheus code from s-b-actuator to s-b-micrometer-metrics
Closes gh-47175
2025-09-12 15:19:34 +01:00
Stéphane Nicoll d7c482aa16 Replace @OptionalParameter with JSpecify's @Nullable
This commit removes OptionalParameter in favor of the nullness support
introduced in Spring Framework 7. The parameter of an action can now
be flagged as optional using JSpecify's @Nullable, and simplifies the
setup for those who are using JSpecify as only a single annotation is
required.

Closes gh-45390
2025-09-10 15:01:43 +02:00
Stéphane Nicoll ee83ff5f6a Revert "Only support @OptionalParameter annotation with endpoint methods"
This reverts commit 450eb48303.

See gh-47136
2025-09-10 14:31:35 +02:00
Phillip Webb 450eb48303 Only support @OptionalParameter annotation with endpoint methods
Remove `@Nullable` support for optional endpoint method parameters in
favor of only supporting `@OptionalParameter`. The annotation processor
now also only supports `@OptionalParameter` detection.

Closes gh-47136
2025-09-09 13:00:50 -07:00
Moritz Halbritter 0fc1a40f3b Polish nullability annotations
See gh-46926
2025-09-09 15:08:44 +02:00
Moritz Halbritter f51f872c28 Improve null-safety of module/spring-boot-actuator
See gh-46926
2025-09-03 15:11:53 +02:00