Merge branch '2.18' into 2.19

cowtowncoder · cowtowncoder · commit e15da897ea3d · 2025-02-28T15:26:52.000-08:00
diff --git a/src/main/java/com/fasterxml/jackson/annotation/JsonProperty.java b/src/main/java/com/fasterxml/jackson/annotation/JsonProperty.java
@@ -39,7 +39,7 @@ public enum MyEnum {
 }
 </pre>
  * as an alternative to using {@link JsonValue} annotation.
- *<br />
+ *<br>
  * NOTE: for {@code Enum}s, empty String is a valid value (and
  * missing {@code value} is taken as empty String), unlike for regular
  * properties, and does NOT mean "use default Enum name".

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public enum MyEnum {`
`39`	`39`	`}`
`40`	`40`	`</pre>`
`41`	`41`	`* as an alternative to using {@link JsonValue} annotation.`
`42`		`- *<br />`
	`42`	`+ *<br>`
`43`	`43`	`* NOTE: for {@code Enum}s, empty String is a valid value (and`
`44`	`44`	`* missing {@code value} is taken as empty String), unlike for regular`
`45`	`45`	`* properties, and does NOT mean "use default Enum name".`