Skip to content

Commit dd77081

Browse files
committed
Merge branch '3.3.x' into 3.4.x
Closes gh-43971
2 parents 7491990 + f39fc87 commit dd77081

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties

+2
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ javadoc-location-org-springframework-data-neo4j={url-spring-data-neo4j-javadoc}
115115
javadoc-location-org-springframework-data-r2dbc={url-spring-data-r2dbc-javadoc}
116116
javadoc-location-org-springframework-data-redis={url-spring-data-redis-javadoc}
117117
javadoc-location-org-springframework-data-rest={url-spring-data-rest-javadoc}
118+
javadoc-location-com-fasterxml-jackson-annotation={url-jackson-annotations-javadoc}
119+
javadoc-location-com-fasterxml-jackson-core={url-jackson-core-javadoc}
118120
javadoc-location-com-fasterxml-jackson-databind={url-jackson-databind-javadoc}
119121
javadoc-location-com-fasterxml-jackson-dataformat-xml={url-jackson-dataformat-xml-javadoc}
120122

spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/spring-mvc.adoc

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,23 +86,23 @@ These features are described in several enums (in Jackson) that map onto propert
8686
| `spring.jackson.deserialization.<feature_name>`
8787
| `true`, `false`
8888

89-
| `com.fasterxml.jackson.core.JsonGenerator.Feature`
89+
| javadoc:com.fasterxml.jackson.core.JsonGenerator$Feature[]
9090
| `spring.jackson.generator.<feature_name>`
9191
| `true`, `false`
9292

9393
| javadoc:com.fasterxml.jackson.databind.MapperFeature[]
9494
| `spring.jackson.mapper.<feature_name>`
9595
| `true`, `false`
9696

97-
| `com.fasterxml.jackson.core.JsonParser.Feature`
97+
| javadoc:com.fasterxml.jackson.core.JsonParser$Feature[]
9898
| `spring.jackson.parser.<feature_name>`
9999
| `true`, `false`
100100

101101
| javadoc:com.fasterxml.jackson.databind.SerializationFeature[]
102102
| `spring.jackson.serialization.<feature_name>`
103103
| `true`, `false`
104104

105-
| `com.fasterxml.jackson.annotation.JsonInclude.Include`
105+
| javadoc:com.fasterxml.jackson.annotation.JsonInclude$Include[]
106106
| configprop:spring.jackson.default-property-inclusion[]
107107
| `always`, `non_null`, `non_absent`, `non_default`, `non_empty`
108108
|===

0 commit comments

Comments
 (0)