Commit 7be3db2d authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.1.x' into 2.2.x

Closes gh-20618
parents 39b965e1 bcce6f9f
...@@ -23,7 +23,7 @@ Before you proceed, you should read the following topics: ...@@ -23,7 +23,7 @@ Before you proceed, you should read the following topics:
* <<overview-endpoint-urls>> * <<overview-endpoint-urls>>
* <<overview-timestamps>> * <<overview-timestamps>>
NOTE: In order to get the correct JSON responses documented below, Jackson must be available.
[[overview-endpoint-urls]] [[overview-endpoint-urls]]
=== URLs === URLs
......
...@@ -1001,6 +1001,8 @@ For example, `health` is exposed as `/actuator/health`. ...@@ -1001,6 +1001,8 @@ For example, `health` is exposed as `/actuator/health`.
TIP: Actuator is supported natively with Spring MVC, Spring WebFlux, and Jersey. 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. 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]] [[production-ready-customizing-management-server-context-path]]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment