Skip to content

Commit e28900f

Browse files
committed
Merge branch '2.19'
2 parents d48a9e4 + 251f278 commit e28900f

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

.github/workflows/cifuzz.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
dry-run: false
3131
language: jvm
3232
- name: Upload Crash
33-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
33+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
3434
if: failure() && steps.build.outcome == 'success'
3535
with:
3636
name: artifacts

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727

2828
# Initializes the CodeQL tools for scanning.
2929
- name: Initialize CodeQL
30-
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
30+
uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
3131
with:
3232
languages: ${{ matrix.language }}
3333

3434
- name: Autobuild
35-
uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
35+
uses: github/codeql-action/autobuild@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
3636

3737
- name: Perform CodeQL Analysis
38-
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
38+
uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8

.github/workflows/dep_build_v2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2424
- name: Set up JDK
25-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
25+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
2626
with:
2727
distribution: 'temurin'
2828
java-version: ${{ matrix.java_version }}

.github/workflows/dep_build_v3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
ref: master
2525
- name: Set up JDK
26-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
26+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
2727
with:
2828
distribution: 'temurin'
2929
java-version: ${{ matrix.java_version }}

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
steps:
3939
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4040
- name: Set up JDK
41-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
41+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
4242
with:
4343
distribution: 'temurin'
4444
java-version: ${{ matrix.java_version }}
@@ -70,7 +70,7 @@ jobs:
7070
run: ./mvnw -B -q -ff -ntp test
7171
- name: Publish code coverage
7272
if: ${{ matrix.release_build && github.event_name != 'pull_request' }}
73-
uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
73+
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
7474
with:
7575
token: ${{ secrets.CODECOV_TOKEN }}
7676
file: ./target/site/jacoco/jacoco.xml

src/main/java/tools/jackson/databind/DeserializationFeature.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -343,15 +343,15 @@ public enum DeserializationFeature implements ConfigFeature
343343

344344
/**
345345
* Feature that can be enabled to allow JSON empty String
346-
* value ("") to be bound as `null` for POJOs and other structured
346+
* value ({@code ""}) to be bound as {@code null} for POJOs and other structured
347347
* values ({@link java.util.Map}s, {@link java.util.Collection}s).
348-
* If disabled, standard POJOs can only be bound from JSON `null` or
348+
* If disabled, standard POJOs can only be bound from JSON {@code null} or
349349
* JSON Object (standard meaning that no custom deserializers or
350350
* constructors are defined; both of which can add support for other
351351
* kinds of JSON values); if enabled, empty JSON String can be taken
352352
* to be equivalent of JSON null.
353353
*<p>
354-
* NOTE: this does NOT apply to scalar values such as booleans, numbers
354+
* NOTE: this does NOT apply to scalar values such as Strings, booleans, numbers
355355
* and date/time types;
356356
* whether these can be coerced depends on
357357
* {@link MapperFeature#ALLOW_COERCION_OF_SCALARS}.
@@ -362,12 +362,12 @@ public enum DeserializationFeature implements ConfigFeature
362362

363363
/**
364364
* Feature that can be enabled to allow empty JSON Array
365-
* value (that is, <code>[ ]</code>) to be bound to POJOs as `null`.
366-
* If disabled, standard POJOs can only be bound from JSON `null` or
365+
* value (that is, {@code[ ]} to be bound to POJOs {@code null}.
366+
* If disabled, standard POJOs can only be bound from JSON {@code null} or
367367
* JSON Object (standard meaning that no custom deserializers or
368368
* constructors are defined; both of which can add support for other
369369
* kinds of JSON values); if enabled, empty JSON Array will be taken
370-
* to be equivalent of JSON null.
370+
* to be equivalent of JSON {@code null}.
371371
*<p>
372372
* Feature is disabled by default.
373373
*/

0 commit comments

Comments
 (0)