Merge branch '2.19' into 3.x

Author: cowtowncoder

.github/workflows/dep_build_v3.yml

@@ -2,8 +2,6 @@ name: Re-build on jackson-databind v3 push
 on:
   repository_dispatch:
     types: [jackson-databind-pushed-v3]
-  # just for testing
-  workflow_dispatch:
 
 permissions:
   contents: read
@@ -21,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
-        ref: master
+        ref: 3.x
     - name: Set up JDK
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
       with:

.github/workflows/main.yml

@@ -2,15 +2,13 @@ name: Build and Deploy Snapshot
 on:
   push:
     branches:
-    - master
-    - "3.0"
+    - 3.x
     paths-ignore:
     - "README.md"
     - "release-notes/*"
   pull_request:
     branches:
-    - master
-    - "3.0"
+    - 3.x
     paths-ignore:
     - "README.md"
     - "release-notes/*"
@@ -63,5 +61,5 @@ jobs:
       uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./target/site/jacoco/jacoco.xml
+        files: ./target/site/jacoco/jacoco.xml
         flags: unittests

release-notes/VERSION-2.x

@@ -4,7 +4,7 @@ Project: jackson-dataformat-xml
 === Releases ===
 ------------------------------------------------------------------------
 
-2.19.0 (not yet released)
+2.19.0-rc (07-Apr-2025)
 
 #700: Unify testing structure/tools [JSTEP-10]
  (fix contributed by Joo Hyuk K)

src/test/java/tools/jackson/dataformat/xml/deser/EmptyWithScalarsTest.java

@@ -5,20 +5,21 @@
 
 import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.annotation.JsonRootName;
+
 import tools.jackson.databind.DeserializationFeature;
 import tools.jackson.databind.ObjectReader;
 import tools.jackson.databind.exc.MismatchedInputException;
 
 import tools.jackson.dataformat.xml.*;
-import tools.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 // [dataformat-xml#473]: 2.11 -> 2.12 coercion of empty to "default"
 // [dataformat-xml#474]: no failure for primitives, no null
 public class EmptyWithScalarsTest extends XmlTestUtil
 {
-    @JacksonXmlRootElement(localName = "w")
+    @JsonRootName("w")
     static class NumbersPrimitive {
         public int i = 1;
         public long l = 2L;
@@ -27,7 +28,7 @@ static class NumbersPrimitive {
         public float f = 0.25f;
     }
 
-    @JacksonXmlRootElement(localName = "w")
+    @JsonRootName("w")
     static class NumbersWrapper {
         public Integer I = Integer.valueOf(1);
         public Long L = Long.valueOf(1L);
@@ -36,13 +37,13 @@ static class NumbersWrapper {
         public Float F = Float.valueOf(0.5f);
     }
 
-    @JacksonXmlRootElement(localName = "w")
+    @JsonRootName("w")
     static class NumbersOther {
         public BigInteger bi = BigInteger.ONE;
         public BigDecimal bd = BigDecimal.ONE;
     }
 
-    @JacksonXmlRootElement(localName = "w")
+    @JsonRootName("w")
     static class MiscOther {
         public Boolean B = Boolean.TRUE;
     }

src/test/java/tools/jackson/dataformat/xml/lists/IterableCollectionBuilder646Test.java

@@ -6,23 +6,23 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 import tools.jackson.databind.annotation.JsonDeserialize;
 
 import tools.jackson.dataformat.xml.XmlMapper;
 import tools.jackson.dataformat.xml.XmlTestUtil;
 import tools.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import tools.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 // [dataformat-xml#646]
 public class IterableCollectionBuilder646Test extends XmlTestUtil
 {
-	@JsonDeserialize(builder = Parent.Builder.class)
-	@JacksonXmlRootElement(localName = "parent")
-	static class Parent {
+    @JsonRootName("parent")
+    @JsonDeserialize(builder = Parent.Builder.class)
+    static class Parent {
 		private final List<Child> children;
 
 		Parent(List<Child> children) {
@@ -53,9 +53,9 @@ public Parent build() {
 		}
 	}
 
-	@JsonDeserialize(builder = Child.Builder.class)
-	@JacksonXmlRootElement(localName = "child")
-	static class Child {
+    @JsonRootName("child")
+    @JsonDeserialize(builder = Child.Builder.class)
+    static class Child {
 		private final String id;
 
 		public Child(String id) {