diff --git a/.github/workflows/dep_build_v2.yml b/.github/workflows/dep_build_v2.yml index 0598f843..b2b8af2a 100644 --- a/.github/workflows/dep_build_v2.yml +++ b/.github/workflows/dep_build_v2.yml @@ -16,7 +16,7 @@ jobs: matrix: java_version: ['8', '17', '21', '24'] # Versions need to align with ones in 'main.yml' workflow - kotlin_version: ['1.9.24', '2.0.21', '2.1.20'] + kotlin_version: ['2.0.21', '2.1.20'] env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" steps: diff --git a/.github/workflows/dep_build_v3.yml b/.github/workflows/dep_build_v3.yml index da61ee1f..2559266a 100644 --- a/.github/workflows/dep_build_v3.yml +++ b/.github/workflows/dep_build_v3.yml @@ -14,7 +14,7 @@ jobs: matrix: java_version: ['17', '21', '24'] # Versions need to align with ones in 'main.yml' workflow - kotlin_version: ['1.9.24', '2.0.21', '2.1.20'] + kotlin_version: ['2.0.21', '2.1.20'] env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" steps: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8dbfce85..b5c13a62 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,10 +22,10 @@ jobs: max-parallel: 5 matrix: java_version: ['8', '11', '17', '21', '24'] - kotlin_version: ['1.9.25', '2.0.21', '2.1.20'] + kotlin_version: ['2.0.21', '2.1.20'] include: - java_version: '8' - kotlin_version: '1.9.25' + kotlin_version: '2.0.21' release_build: 'R' env: JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" diff --git a/README.md b/README.md index ce791cbf..8acbda44 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,7 @@ println(arrayNode.toString()) // ["foo",true,1,1.0,"YmFy"] Different `kotlin-core` versions are supported by different Jackson Kotlin module minor versions. Here is an incomplete list of supported versions: +* Jackson 2.20.x: Kotlin-core 2.0 - 2.1 * Jackson 2.19.x: Kotlin-core 1.9 - 2.1 * Jackson 2.18.x: Kotlin-core 1.8 - 2.1 * Jackson 2.17.x: Kotlin-core 1.7 - 2.0 diff --git a/pom.xml b/pom.xml index 2e2e9e1c..53644d4b 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 1.8 1.8 - 1.9.25 + 2.0.21 com/fasterxml/jackson/module/kotlin @@ -232,7 +232,7 @@ --> - 2.18.0 + 2.19.0 jar @@ -245,19 +245,6 @@ true true - - - - com.fasterxml.jackson.module.kotlin.KotlinModule#getUseKotlinPropertyNameForGetter() - - com.fasterxml.jackson.module.kotlin.KotlinModule#getSingletonSupport() - com.fasterxml.jackson.module.kotlin.SingletonSupport - - - com.fasterxml.jackson.module.kotlin.KotlinNamesAnnotationIntrospector#KotlinNamesAnnotationIntrospector(com.fasterxml.jackson.module.kotlin.ReflectionCache,boolean) - - com.fasterxml.jackson.module.kotlin.KotlinKeyDeserializers#INSTANCE - com.fasterxml.jackson.module.kotlin.ReflectionCache$BooleanTriState diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x index d56cae88..6a7d5934 100644 --- a/release-notes/CREDITS-2.x +++ b/release-notes/CREDITS-2.x @@ -15,6 +15,11 @@ Authors: Contributors: +# 2.20.0 (not yet released) + +WrongWrong (@k163377) +* #967: Update settings for 2.20 + # 2.19.1 (not yet released) # 2.19.0 (24-Apr-2025) diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index fdb99f7a..78231626 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -18,7 +18,7 @@ Co-maintainers: 2.20.0 (not yet released) -- +#967: Kotlin has been upgraded to 2.0.21. 2.19.1 (not yet released)