Skip to content

Commit c2cd802

Browse files
committed
Merge branch '2.x' into 3.x
2 parents 4264d50 + ca15ac8 commit c2cd802

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.github/workflows/dep_build_v2.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ jobs:
2121
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2222
steps:
2323
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
24+
with:
25+
ref: 2.x
2426
- name: Set up JDK
2527
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2628
with:

.github/workflows/main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
name: Build and Deploy Snapshot
22
on:
33
push:
4-
branches:
5-
- 3.x
4+
branches: [3.*]
65
paths-ignore:
76
- "README.md"
87
- "release-notes/*"
98
pull_request:
10-
branches:
11-
- 3.x
9+
branches: [3.*]
1210
paths-ignore:
1311
- "README.md"
1412
- "release-notes/*"

release-notes/VERSION-2.x

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ Co-maintainers:
1616
=== Releases ===
1717
------------------------------------------------------------------------
1818

19-
2.19.0 (not yet released)
19+
2.20.0 (not yet released)
20+
21+
-
22+
23+
2.19.0 (24-Apr-2025)
2024

2125
#959: Extension functions has been added to simplify `configOverride` calls to `ObjectMapper` and `Module.SetupContext`.
2226
#954: Replaced `OptBoolean` of internal caching with a common implementation.
@@ -26,9 +30,6 @@ Co-maintainers:
2630
A `RuntimeJsonMappingException` will be thrown in case of inconsistency.
2731
This fixes a problem that broke `Kotlin` null safety by reading null as a value even if the type parameter was specified as non-null.
2832
It also checks for custom errors in ObjectMapper that cause a different value to be read than the specified type parameter.
29-
30-
2.19.0-rc2 (07-Apr-2025)
31-
3233
#929: Added consideration of `JsonProperty.isRequired` added in `2.19` in `hasRequiredMarker` processing.
3334
Previously `JsonProperty.required` was defined as `Boolean` with default `false`,
3435
so `KotlinModule` was forced to override it if the value was `false`.

0 commit comments

Comments
 (0)