Skip to content

Commit 609ca96

Browse files
committed
Merge branch '2.19'
2 parents 429092f + d12d0c3 commit 609ca96

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

.github/workflows/dep_build_v2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323
- name: Set up JDK
24-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
24+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
2525
with:
2626
distribution: 'temurin'
2727
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@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
26+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.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
@@ -32,7 +32,7 @@ jobs:
3232
steps:
3333
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3434
- name: Set up JDK
35-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
35+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
3636
with:
3737
distribution: 'temurin'
3838
java-version: ${{ matrix.java_version }}
@@ -60,7 +60,7 @@ jobs:
6060
run: ./mvnw -B -q -ff -ntp test
6161
- name: Publish code coverage
6262
if: ${{ matrix.release_build && github.event_name != 'pull_request' }}
63-
uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
63+
uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
6464
with:
6565
token: ${{ secrets.CODECOV_TOKEN }}
6666
file: ./target/site/jacoco/jacoco.xml

avro/src/test/java/tools/jackson/dataformat/avro/failing/AnyProperties75Test.java renamed to avro/src/test/java/tools/jackson/dataformat/avro/AnyProperties75Test.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
package tools.jackson.dataformat.avro.failing;
1+
package tools.jackson.dataformat.avro;
22

33
import java.util.HashMap;
44
import java.util.Map;
55

66
import com.fasterxml.jackson.annotation.JsonAnyGetter;
77
import com.fasterxml.jackson.annotation.JsonAnySetter;
88

9-
import tools.jackson.dataformat.avro.AvroMapper;
10-
import tools.jackson.dataformat.avro.AvroSchema;
11-
import tools.jackson.dataformat.avro.AvroTestBase;
12-
139
// for [dataformats-binary#75] -- not legit, probably,
1410
// but included for now to see if there's something we
1511
// could do

0 commit comments

Comments
 (0)