Merge pull request #967 from k163377/organize-deps

Update settings for `2.20`

Author: k163377

.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:

.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:

.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"

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

pom.xml

@@ -62,7 +62,7 @@
         <javac.src.version>1.8</javac.src.version>
         <javac.target.version>1.8</javac.target.version>
 
-        <version.kotlin>1.9.25</version.kotlin>
+        <version.kotlin>2.0.21</version.kotlin>
 
         <!-- Generate PackageVersion.java into this directory. -->
         <packageVersion.dir>com/fasterxml/jackson/module/kotlin</packageVersion.dir>
@@ -232,7 +232,7 @@
                             -->
                             <!-- 30-Sep-2023, wrongwrong: For 2.16, compare to 2.15.2 baseline
                             -->
-                            <version>2.18.0</version>
+                            <version>2.19.0</version>
                             <type>jar</type>
                         </dependency>
                     </oldVersion>
@@ -245,19 +245,6 @@
                         <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
                         <breakBuildOnSourceIncompatibleModifications>true</breakBuildOnSourceIncompatibleModifications>
                         <excludes>
-                            <!-- public -->
-                            <!-- removed -->
-                            <exclude>
-                                com.fasterxml.jackson.module.kotlin.KotlinModule#getUseKotlinPropertyNameForGetter()
-                            </exclude>
-                            <exclude>com.fasterxml.jackson.module.kotlin.KotlinModule#getSingletonSupport()</exclude>
-                            <exclude>com.fasterxml.jackson.module.kotlin.SingletonSupport</exclude>
-                            <!-- internal -->
-                            <exclude>
-                                com.fasterxml.jackson.module.kotlin.KotlinNamesAnnotationIntrospector#KotlinNamesAnnotationIntrospector(com.fasterxml.jackson.module.kotlin.ReflectionCache,boolean)
-                            </exclude>
-                            <exclude>com.fasterxml.jackson.module.kotlin.KotlinKeyDeserializers#INSTANCE</exclude>
-                            <exclude>com.fasterxml.jackson.module.kotlin.ReflectionCache$BooleanTriState</exclude>
                         </excludes>
                     </parameter>
                 </configuration>

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)

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)