Merge branch '2.18' into 2.19

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -36,6 +36,9 @@ Project: jackson-databind
 
 #4733: Wrong serialization of Type Ids for certain types of Enum values
  (reported by @nlisker)
+#4783 Possibly wrong behavior of @JsonMerge
+ (reported by @nlisker)
+ (fix by Joo-Hyuk K)
 #4787: Wrong `String.format()` in `StdDelegatingDeserializer` hides actual error
  (reported by @Horus1337)
 #4788: `EnumFeature.WRITE_ENUMS_TO_LOWERCASE` overrides `@JsonProperty` values
@@ -44,9 +47,6 @@ Project: jackson-databind
 #4790: Fix `@JsonAnySetter` issue with "setter" method (related to #4639)
  (reported by @bsa01)
  (fix by Joo-Hyuk K)
- #4783 Possibly wrong behavior of @JsonMerge
- (reported by @nlisker)
- (fix by Joo-Hyuk K)
 
 2.18.1 (28-Oct-2024)