Skip to content

Commit 7ee7c82

Browse files
committed
Merge remote-tracking branch 'FasterXML/2.19' into 399
2 parents f4a5449 + 13ff7d6 commit 7ee7c82

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

.github/workflows/dep_build_v3.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: Re-build on jackson-databind v3 push
22
on:
33
repository_dispatch:
44
types: [jackson-databind-pushed-v3]
5-
# just for testing
6-
workflow_dispatch:
75

86
permissions:
97
contents: read
@@ -22,7 +20,7 @@ jobs:
2220
steps:
2321
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
2422
with:
25-
ref: master
23+
ref: 3.x
2624
- name: Set up JDK
2725
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
2826
with:
@@ -31,5 +29,3 @@ jobs:
3129
cache: 'maven'
3230
- name: Build and test
3331
run: ./mvnw -B -ff -ntp -Dversion.kotlin=${{ matrix.kotlin_version }} clean verify
34-
35-
# No recursive rebuild (yet?)

.github/workflows/main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@ name: Build and Deploy Snapshot
22
on:
33
push:
44
branches:
5-
- master
6-
- "3.0"
5+
- 3.x
76
- "2.19"
87
paths-ignore:
98
- "README.md"
109
- "release-notes/*"
1110
pull_request:
1211
branches:
13-
- master
14-
- "3.0"
12+
- 3.x
1513
- "2.19"
1614
paths-ignore:
1715
- "README.md"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ when(root){
196196
# Configuration
197197

198198
The Kotlin module may be given a few configuration parameters at construction time;
199-
see the [inline documentation](https://github.com/FasterXML/jackson-module-kotlin/blob/master/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt)
199+
see the [inline documentation](https://github.com/FasterXML/jackson-module-kotlin/blob/2.19/src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt)
200200
for details on what options are available and what they do.
201201

202202
```kotlin

release-notes/VERSION-2.x

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Co-maintainers:
1616
=== Releases ===
1717
------------------------------------------------------------------------
1818

19-
2.19.0 (not yet released)
19+
2.19.0-rc2 (07-Apr-2025)
2020

2121
#929: Added consideration of `JsonProperty.isRequired` added in `2.19` in `hasRequiredMarker` processing.
2222
Previously `JsonProperty.required` was defined as `Boolean` with default `false`,

0 commit comments

Comments
 (0)