Merge branch '2.x' into 3.x

Author: cowtowncoder

.github/workflows/dep_build_v2.yml

@@ -11,7 +11,7 @@ permissions:
 jobs:
   build:
     # Do we want wide matrix build? For now, limited
-    runs-on: 'ubuntu-22.04'
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -20,8 +20,10 @@ jobs:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      with:
+        ref: 2.x
     - name: Set up JDK
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}

.github/workflows/dep_build_v3.yml

@@ -23,7 +23,7 @@ jobs:
       with:
         ref: 3.x
     - name: Set up JDK
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}

.github/workflows/main.yml

@@ -1,14 +1,12 @@
 name: Build and Deploy Snapshot
 on:
   push:
-    branches:
-    - 3.x
+    branches: [3.*]
     paths-ignore:
     - "README.md"
     - "release-notes/*"
   pull_request:
-    branches:
-    - 3.x
+    branches: [3.*]
     paths-ignore:
     - "README.md"
     - "release-notes/*"
@@ -17,7 +15,7 @@ permissions:
 
 jobs:
   build:
-    runs-on: 'ubuntu-22.04'
+    runs-on: 'ubuntu-24.04'
     strategy:
       fail-fast: false
       matrix:
@@ -30,7 +28,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}
@@ -58,7 +56,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@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
+      uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ./target/site/jacoco/jacoco.xml

release-notes/VERSION-2.x

@@ -14,10 +14,11 @@ Active maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
-#571: Unable to deserialize a pojo with IonStruct
- (reported, fix contributed by Josh C)
+2.20.0 (not yet released)
+
+-
 
-2.19.0-rc2 (07-Apr-2025)
+2.19.0 (24-Apr-2025)
 
 #300: (smile) Floats are encoded with sign extension while doubles without
  (reported by Steven F)
@@ -39,6 +40,8 @@ Active maintainers:
  (contributed by Joo-Hyuk K)
 #568: Improve ASCII decoding performance for `CBORParser`
  (contributed by Manuel S)
+#571: Unable to deserialize a pojo with IonStruct
+ (reported, fix contributed by Josh C)
 
 2.18.4 (not yet released)