Merge branch '3.3.x' into 3.4.x

Closes gh-43971
spring-projects · Jan 27, 2025 · dd77081 · dd77081
2 parents 7491990 + f39fc87
commit dd77081
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...ain/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties b/...ain/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties
@@ -115,6 +115,8 @@ javadoc-location-org-springframework-data-neo4j={url-spring-data-neo4j-javadoc}
 javadoc-location-org-springframework-data-r2dbc={url-spring-data-r2dbc-javadoc}
 javadoc-location-org-springframework-data-redis={url-spring-data-redis-javadoc}
 javadoc-location-org-springframework-data-rest={url-spring-data-rest-javadoc}
+javadoc-location-com-fasterxml-jackson-annotation={url-jackson-annotations-javadoc}
+javadoc-location-com-fasterxml-jackson-core={url-jackson-core-javadoc}
 javadoc-location-com-fasterxml-jackson-databind={url-jackson-databind-javadoc}
 javadoc-location-com-fasterxml-jackson-dataformat-xml={url-jackson-dataformat-xml-javadoc}
 

diff --git a/...t-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/spring-mvc.adoc b/...t-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/spring-mvc.adoc
@@ -86,23 +86,23 @@ These features are described in several enums (in Jackson) that map onto propert
 | `spring.jackson.deserialization.<feature_name>`
 | `true`, `false`
 
-| `com.fasterxml.jackson.core.JsonGenerator.Feature`
+| javadoc:com.fasterxml.jackson.core.JsonGenerator$Feature[]
 | `spring.jackson.generator.<feature_name>`
 | `true`, `false`
 
 | javadoc:com.fasterxml.jackson.databind.MapperFeature[]
 | `spring.jackson.mapper.<feature_name>`
 | `true`, `false`
 
-| `com.fasterxml.jackson.core.JsonParser.Feature`
+| javadoc:com.fasterxml.jackson.core.JsonParser$Feature[]
 | `spring.jackson.parser.<feature_name>`
 | `true`, `false`
 
 | javadoc:com.fasterxml.jackson.databind.SerializationFeature[]
 | `spring.jackson.serialization.<feature_name>`
 | `true`, `false`
 
-| `com.fasterxml.jackson.annotation.JsonInclude.Include`
+| javadoc:com.fasterxml.jackson.annotation.JsonInclude$Include[]
 | configprop:spring.jackson.default-property-inclusion[]
 | `always`, `non_null`, `non_absent`, `non_default`, `non_empty`
 |===