Skip to content

Commit de4f1e3

Browse files
committed
Merge branch '2.19' into 3.x
2 parents ed68f66 + 13ff7d6 commit de4f1e3

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
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,15 +2,13 @@ name: Build and Deploy Snapshot
22
on:
33
push:
44
branches:
5-
- master
6-
- "3.0"
5+
- 3.x
76
paths-ignore:
87
- "README.md"
98
- "release-notes/*"
109
pull_request:
1110
branches:
12-
- master
13-
- "3.0"
11+
- 3.x
1412
paths-ignore:
1513
- "README.md"
1614
- "release-notes/*"

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)