Merge branch '2.18' into 2.19

cowtowncoder · cowtowncoder · commit cb923b6fafc3 · 2024-11-01T13:36:41.000-07:00
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -120,7 +120,7 @@ Project: jackson-databind
 #4709: Add `JacksonCollectors` with `toArrayNode()` implementation
  (contributed by @rikkarth)
 
-2.17.3 (not yet released)
+2.17.3 (01-Nov-2024)
 
 #4718: Should not fail on trying to serialize `java.time.DateTimeException`
 
diff --git a/src/main/java/com/fasterxml/jackson/databind/SerializationFeature.java b/src/main/java/com/fasterxml/jackson/databind/SerializationFeature.java
@@ -246,7 +246,7 @@ public enum SerializationFeature implements ConfigFeature
      * {@link java.util.Calendar} which will always use timezone Calendar value has).
      * Setting is also ignored by Joda date/time values.
      *<p>
-     * Featured is enabled by default for backwards-compatibility purposes (in
+     * Feature is enabled by default for backwards-compatibility purposes (in
      * Jackson 2.12 override was always done if there was explicitly defined timezone).
      *
      * @since 2.13

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ public enum SerializationFeature implements ConfigFeature`
`246`	`246`	`* {@link java.util.Calendar} which will always use timezone Calendar value has).`
`247`	`247`	`* Setting is also ignored by Joda date/time values.`
`248`	`248`	`*<p>`
`249`		`- * Featured is enabled by default for backwards-compatibility purposes (in`
	`249`	`+ * Feature is enabled by default for backwards-compatibility purposes (in`
`250`	`250`	`* Jackson 2.12 override was always done if there was explicitly defined timezone).`
`251`	`251`	`*`
`252`	`252`	`* @since 2.13`