Skip to content

Commit 73d3790

Browse files
committed
Merge branch '2.x' into 3.x
2 parents 65b8b4a + b50af36 commit 73d3790

5 files changed

Lines changed: 13 additions & 12 deletions

File tree

.github/workflows/dep_build_v2.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
env:
2020
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2121
steps:
22-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
22+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2323
with:
2424
ref: 2.x
2525
- name: Set up JDK
26-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
26+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2727
with:
2828
distribution: 'temurin'
2929
java-version: ${{ matrix.java_version }}

.github/workflows/dep_build_v3.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
env:
2020
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2121
steps:
22-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
22+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2323
with:
2424
ref: 3.x
2525
- name: Set up JDK
26-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
26+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2727
with:
2828
distribution: 'temurin'
2929
java-version: ${{ matrix.java_version }}

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
env:
2727
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2828
steps:
29-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
29+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3030
- name: Set up JDK
31-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
31+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
3232
with:
3333
distribution: 'temurin'
3434
java-version: ${{ matrix.java_version }}
@@ -56,7 +56,7 @@ jobs:
5656
run: ./mvnw -B -q -ff -ntp test
5757
- name: Publish code coverage
5858
if: ${{ matrix.release_build && github.event_name != 'pull_request' }}
59-
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
59+
uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
6060
with:
6161
token: ${{ secrets.CODECOV_TOKEN }}
6262
files: ./target/site/jacoco/jacoco.xml

csv/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ To use this extension on Maven-based projects, use following dependency:
2020
<dependency>
2121
<groupId>com.fasterxml.jackson.dataformat</groupId>
2222
<artifactId>jackson-dataformat-csv</artifactId>
23-
<version>2.13.0</version>
23+
<version>2.20.0</version>
2424
</dependency>
2525
```
2626

release-notes/VERSION-2.x

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ Active Maintainers:
1414
=== Releases ===
1515
------------------------------------------------------------------------
1616

17-
(not yet released)
17+
2.21.0 (not yet released)
18+
19+
No changes since 2.20
20+
21+
2.20.0 (28-Aug-2025)
1822

1923
#497: (csv, toml, yaml): `UTF8Reader` throws "Need to move partially decoded character;
2024
buffer not modifiable" when read only one chinese char
2125
NOTE: csv part fixed in 2.19.0, toml and yaml in 2.20.0
2226
(reported by @mrtaolili)
23-
24-
2.20.0-rc1 (04-Aug-2025)
25-
2627
#564: (csv) `CsvParser.getNumberValue()`, related, do not throw exception
2728
for non-numeric tokens
2829
- Generate SBOMs [JSTEP-14]

0 commit comments

Comments
 (0)