Merge branch '2.2.x'

Closes gh-20619
6 years ago · 34b71561d3
2 changed files with 3 additions and 1 deletions
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/docs/asciidoc/index.adoc
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/docs/asciidoc/index.adoc
@ -21,7 +21,7 @@ Before you proceed, you should read the following topics:
				@@ -21,7 +21,7 @@ Before you proceed, you should read the following topics:
 * <<overview-endpoint-urls>>
 * <<overview-timestamps>>

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

 [[overview-endpoint-urls]]
 === URLs
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/production-ready-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/production-ready-features.adoc
@ -1113,6 +1113,8 @@ For example, `health` is exposed as `/actuator/health`.
				@@ -1113,6 +1113,8 @@ For example, `health` is exposed as `/actuator/health`.
 TIP: Actuator is supported natively with Spring MVC, Spring WebFlux, and Jersey.
 If both Jersey and Spring MVC are available, Spring MVC will be used.

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


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