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,6 +20,8 @@ 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@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:

.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:

release-notes/VERSION-2.x

@@ -4,17 +4,20 @@ Project: jackson-dataformat-xml
 === Releases ===
 ------------------------------------------------------------------------
 
+2.20.0 (not yet released)
+
+-
+
+2.19.0-rc2 (24-Apr-2025)
+
 #508: `XmlMapper` is unable to deserialise into an empty record
  (reported by @protazy)
+#700: Unify testing structure/tools [JSTEP-10]
+ (fix contributed by Joo Hyuk K)
 #714: Root-level `null` handling (via `xsi:nil`) leaves trailing token in
  `JsonParser`-exposed token stream
 #745: Add feature to include `standalone='yes'` in xml declaration
  (contributed by @duoduobingbing)
-
-2.19.0-rc2 (07-Apr-2025)
-
-#700: Unify testing structure/tools [JSTEP-10]
- (fix contributed by Joo Hyuk K)
 - Upgrade Woodstox to 7.1.0
 
 2.18.3 (28-Feb-2025)