Merge branch '3.1.x'

Closes gh-38090
2 years ago · 4e0dd34bbb
1 changed files with 1 additions and 0 deletions
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/spring-mvc.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/spring-mvc.adoc
@ -59,6 +59,7 @@ The `ObjectMapper` (or `XmlMapper` for Jackson XML converter) instance (created
				@@ -59,6 +59,7 @@ The `ObjectMapper` (or `XmlMapper` for Jackson XML converter) instance (created
 * `MapperFeature.DEFAULT_VIEW_INCLUSION` is disabled
 * `DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES` is disabled
 * `SerializationFeature.WRITE_DATES_AS_TIMESTAMPS` is disabled
+* `SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS` is disabled

 Spring Boot also has some features to make it easier to customize this behavior.