Skip to content

Commit 07c0d22

Browse files
committed
Merge branch '2.19'
2 parents ca640a1 + 6d0c19d commit 07c0d22

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
max-parallel: 5
2727
matrix:
2828
java_version: ['17', '21', '23']
29-
kotlin_version: ['1.9.24', '2.0.21', '2.1.0']
29+
kotlin_version: ['1.9.25', '2.0.21', '2.1.0']
3030
include:
3131
- java_version: '17'
32-
kotlin_version: '1.9.24'
32+
kotlin_version: '1.9.25'
3333
release_build: 'R'
3434
env:
3535
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<javac.src.version>17</javac.src.version>
6262
<javac.target.version>17</javac.target.version>
6363

64-
<version.kotlin>1.9.24</version.kotlin>
64+
<version.kotlin>1.9.25</version.kotlin>
6565

6666
<!-- Generate PackageVersion.java into this directory. -->
6767
<packageVersion.dir>tools/jackson/module/kotlin</packageVersion.dir>

release-notes/VERSION-2.x

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Co-maintainers:
1717
------------------------------------------------------------------------
1818

1919
2.19.0 (not yet released)
20+
21+
#889: Kotlin has been upgraded to 1.9.25.
2022
#885: A new `StrictNullChecks` option(KotlinFeature.NewStrictNullChecks) has been added which greatly improves throughput.
2123
Benchmarks show a consistent throughput drop of less than 2% when enabled (prior to the improvement, the worst throughput drop was more than 30%).
2224
Note that the new backend changes the exception thrown to `InvalidNullException` and with it the error message.
@@ -28,7 +30,6 @@ Co-maintainers:
2830
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.
2931
#878: Fixed a problem where settings like `@JsonSetter(nulls = AS_EMPTY)` were not being applied when the input was `undefined`.
3032
#869: By using Enum.entries in the acquisition of KotlinFeature.defaults, the initialization load was reduced, albeit slightly.
31-
#861: Kotlin has been upgraded to 1.9.24.
3233
#858: Minor performance improvement of findDefaultCreator in edge cases.
3334
#839: Remove useKotlinPropertyNameForGetter and unify with kotlinPropertyNameAsImplicitName.
3435
#835: Remove old SingletonSupport class and unified with KotlinFeature.SingletonSupport.

0 commit comments

Comments
 (0)