Merge branch '2.19'

FasterXML · Dec 24, 2024 · 609ca96 · 609ca96
2 parents 429092f + d12d0c3
commit 609ca96
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/dep_build_v2.yml b/.github/workflows/dep_build_v2.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK
-      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
+      uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}

diff --git a/.github/workflows/dep_build_v3.yml b/.github/workflows/dep_build_v3.yml
@@ -23,7 +23,7 @@ jobs:
       with:
         ref: master
     - name: Set up JDK
-      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
+      uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK
-      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
+      uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}
@@ -60,7 +60,7 @@ jobs:
       run: ./mvnw -B -q -ff -ntp test
     - name: Publish code coverage
       if: ${{ matrix.release_build && github.event_name != 'pull_request' }}
-      uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
+      uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         file: ./target/site/jacoco/jacoco.xml

diff --git a/...mat/avro/failing/AnyProperties75Test.java → .../dataformat/avro/AnyProperties75Test.java b/...mat/avro/failing/AnyProperties75Test.java → .../dataformat/avro/AnyProperties75Test.java
@@ -1,15 +1,11 @@
-package tools.jackson.dataformat.avro.failing;
+package tools.jackson.dataformat.avro;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 
-import tools.jackson.dataformat.avro.AvroMapper;
-import tools.jackson.dataformat.avro.AvroSchema;
-import tools.jackson.dataformat.avro.AvroTestBase;
-
 // for [dataformats-binary#75] -- not legit, probably,
 // but included for now to see if there's something we
 // could do