Merge branch '2.17'

FasterXML · Nov 15, 2023 · 1ce43d5 · 1ce43d5
2 parents b93d8c2 + 280ae1a
commit 1ce43d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,15 +4,15 @@ on:
     branches:
     - master
     - "3.0"
-    - "2.16"
+    - "2.17"
     paths-ignore:
     - "README.md"
     - "release-notes/*"
   pull_request:
     branches:
     - master
     - "3.0"
-    - "2.16"
+    - "2.17"
     paths-ignore:
     - "README.md"
     - "release-notes/*"

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -8,20 +8,21 @@ Modules:
 === Releases ===
 ------------------------------------------------------------------------
 
-Not yet released
+2.17.0 (not yet released)
+
+-
+
+2.16.0 (15-Nov-2023)
 
 #263: Add `JavaTimeFeature.ALWAYS_ALLOW_STRINGIFIED_TIMESTAMPS` to allow parsing
   quoted numbers when using a custom pattern (DateTimeFormatter)
  (contributed by M.P. Korstanje)
-#281: (datetime) Add `JavaTimeFeature.NORMALIZE_DESERIALIZED_ZONE_ID` to allow
-  disabling ZoneId normalization on deserialization
- (requested by @indyana)
-
-2.16.0-rc1 (20-Oct-2023)
-
 #272: (datetime) `JsonFormat.Feature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS`
   not respected when deserialising `Instant`s
  (fix contributed by Raman B)
+#281: (datetime) Add `JavaTimeFeature.NORMALIZE_DESERIALIZED_ZONE_ID` to allow
+  disabling ZoneId normalization on deserialization
+ (requested by @indyana)
 
 2.15.3 (12-Oct-2023)
 2.15.2 (30-May-2023)