Merge branch '2.19'

FasterXML · Oct 13, 2024 · b60cccc · b60cccc
2 parents d75b1a0 + 41dc9b9
commit b60cccc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/dep_build_v2.yml b/.github/workflows/dep_build_v2.yml
@@ -19,9 +19,9 @@ jobs:
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: Set up JDK
-      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.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
@@ -19,11 +19,11 @@ jobs:
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       with:
         ref: master
     - name: Set up JDK
-      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,9 +30,9 @@ jobs:
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: Set up JDK
-      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.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: github.event_name != 'pull_request' && matrix.java_version == '8'
-      uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         file: ./target/site/jacoco/jacoco.xml

diff --git a/afterburner/src/test/java/perftest/TestJvmDeserPerf.java b/afterburner/src/test/java/perftest/TestJvmDeserPerf.java
@@ -107,7 +107,7 @@ public void test()
     protected int testDeser(ObjectMapper mapper, byte[] input, int reps)
         throws Exception
     {
-        JavaType type = TypeFactory.defaultInstance().constructType(MediaItem.class);
+        JavaType type = mapper.constructType(MediaItem.class);
         MediaItem item = null;
         for (int i = 0; i < reps; ++i) {
             item = mapper.readValue(input, 0, input.length, type);