Skip to content

Commit 3a09a78

Browse files
committed
Merge branch '2.14' into 2.15
2 parents 338999b + f520f2a commit 3a09a78

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
java_version: ['8', '11', '17']
26-
# Jackson 2.15 drops support for Kotlin 1.4, adds 1.8
26+
# Jackson 2.15 drops support for Kotlin 1.4
2727
kotlin_version: ['1.5.32', '1.6.21', '1.7.20', '1.8.10', '1.8.20-RC']
2828
os: ['ubuntu-20.04']
2929
env:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Different `kotlin-core` versions are supported by different Jackson Kotlin modul
131131
Here is an incomplete list of supported versions:
132132

133133
* Jackson 2.15.x: Kotlin-core 1.5 - 1.8
134-
* Jackson 2.14.x: Kotlin-core 1.4 - 1.7
134+
* Jackson 2.14.x: Kotlin-core 1.4 - 1.8
135135
* Jackson 2.13.x: Kotlin-core 1.4 - 1.7
136136

137137
# Annotations

0 commit comments

Comments
 (0)