Merge branch '2.17'

FasterXML · Nov 16, 2023 · bd3b2c9 · bd3b2c9
2 parents 3126d19 + 94b8ff8
commit bd3b2c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 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/*"
@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['8', '11', '17']
+        java_version: ['8', '11', '17', '21']
         kotlin_version: ['1.6.21', '1.7.20', '1.8.22', '1.9.0']
         os: ['ubuntu-20.04']
     env:

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -16,7 +16,11 @@ Co-maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
-2.16.0-rc1 (20-Oct-2023)
+2.17.0 (not yet released)
+
+-
+
+2.16.0 (15-Nov-2023)
 
 #707: If JsonSetter(nulls = Nulls.SKIP) is specified, the default argument is now used when null.
 #700: Reduce the load on the search process for serializers.