Skip to content

Commit 34b7156

Browse files
committed
Merge branch '2.2.x'
Closes gh-20619
2 parents ec8d2c5 + 7be3db2 commit 34b7156

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/docs/asciidoc/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Before you proceed, you should read the following topics:
2121
* <<overview-endpoint-urls>>
2222
* <<overview-timestamps>>
2323

24-
24+
NOTE: In order to get the correct JSON responses documented below, Jackson must be available.
2525

2626
[[overview-endpoint-urls]]
2727
=== URLs

spring-boot-project/spring-boot-docs/src/docs/asciidoc/production-ready-features.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,6 +1113,8 @@ For example, `health` is exposed as `/actuator/health`.
11131113
TIP: Actuator is supported natively with Spring MVC, Spring WebFlux, and Jersey.
11141114
If both Jersey and Spring MVC are available, Spring MVC will be used.
11151115

1116+
NOTE: Jackson is a required dependency in order to get the correct JSON responses as documented in the API documentation ({spring-boot-actuator-restapi}/html[HTML] or {spring-boot-actuator-restapi}/pdf/spring-boot-actuator-web-api.pdf[PDF]).
1117+
11161118

11171119

11181120
[[production-ready-customizing-management-server-context-path]]

0 commit comments

Comments
 (0)