From f964610cdc0a76e99c6b38534f859f8ef3dbc93e Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Wed, 22 Jan 2025 15:44:22 -0800
Subject: [PATCH 1/2] Upgrade kotlin dep to 1.9.25 (from 1.9.24)

---
 .github/workflows/main.yml | 4 ++--
 pom.xml                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 12e0b48fb..2531061ca 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,10 +28,10 @@ jobs:
       max-parallel: 5
       matrix:
         java_version: ['8', '11', '17', '21', '23']
-        kotlin_version: ['1.9.24', '2.0.21', '2.1.0']
+        kotlin_version: ['1.9.25', '2.0.21', '2.1.0']
         include:
           - java_version: '8'
-            kotlin_version: '1.9.24'
+            kotlin_version: '1.9.25'
             release_build: 'R'
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
diff --git a/pom.xml b/pom.xml
index e5770e1c3..413a1f647 100644
--- a/pom.xml
+++ b/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.24</version.kotlin>
+        <version.kotlin>1.9.25</version.kotlin>
 
         <!-- Generate PackageVersion.java into this directory. -->
         <packageVersion.dir>com/fasterxml/jackson/module/kotlin</packageVersion.dir>

From 5a9dbafaa9ec4b06256be16d859befc75d0ec6e9 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Wed, 22 Jan 2025 15:46:11 -0800
Subject: [PATCH 2/2] Update release notes

---
 release-notes/VERSION-2.x | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index 162d064b8..76c23334e 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -17,6 +17,8 @@ Co-maintainers:
 ------------------------------------------------------------------------
 
 2.19.0 (not yet released)
+
+#889: Kotlin has been upgraded to 1.9.25.
 #885: A new `StrictNullChecks` option(KotlinFeature.NewStrictNullChecks) has been added which greatly improves throughput.
  Benchmarks show a consistent throughput drop of less than 2% when enabled (prior to the improvement, the worst throughput drop was more than 30%).
  Note that the new backend changes the exception thrown to `InvalidNullException` and with it the error message.
@@ -28,7 +30,6 @@ Co-maintainers:
  This is a problematic process that has been marked as deprecated for a very long time and will be removed in 2.20 or later.
 #878: Fixed a problem where settings like `@JsonSetter(nulls = AS_EMPTY)` were not being applied when the input was `undefined`.
 #869: By using Enum.entries in the acquisition of KotlinFeature.defaults, the initialization load was reduced, albeit slightly.
-#861: Kotlin has been upgraded to 1.9.24.
 #858: Minor performance improvement of findDefaultCreator in edge cases.
 #839: Remove useKotlinPropertyNameForGetter and unify with kotlinPropertyNameAsImplicitName.
 #835: Remove old SingletonSupport class and unified with KotlinFeature.SingletonSupport.