Skip to content

Commit 7be3db2

Browse files
committed
Merge branch '2.1.x' into 2.2.x
Closes gh-20618
2 parents 39b965e + bcce6f9 commit 7be3db2

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Before you proceed, you should read the following topics:
2323
* <<overview-endpoint-urls>>
2424
* <<overview-timestamps>>
2525

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

2828
[[overview-endpoint-urls]]
2929
=== URLs

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

+2
Original file line numberDiff line numberDiff line change
@@ -1001,6 +1001,8 @@ For example, `health` is exposed as `/actuator/health`.
10011001
TIP: Actuator is supported natively with Spring MVC, Spring WebFlux, and Jersey.
10021002
If both Jersey and Spring MVC are available, Spring MVC will be used.
10031003

1004+
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]).
1005+
10041006

10051007

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

0 commit comments

Comments
 (0)