Merge branch '2.19' into 3.x

Author: cowtowncoder

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

@@ -21,7 +21,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

@@ -30,7 +30,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 +58,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/CREDITS-2.x

@@ -271,3 +271,8 @@ Bas Passon (@bpasson)
 * Reported, contributed fix for #646: Deserializing fails when using builder classes
   with `Iterable` Collection setters
  (2.17.1)
+
+多多冰冰 (@duoduobingbing)
+
+* Contributed #745: Add feature to include `standalone='yes'` in xml declaration
+ (2.19.0)

release-notes/VERSION-2.x

@@ -4,7 +4,10 @@ Project: jackson-dataformat-xml
 === Releases ===
 ------------------------------------------------------------------------
 
-2.19.0-rc (07-Apr-2025)
+#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)

src/main/java/tools/jackson/dataformat/xml/XmlWriteFeature.java

@@ -28,6 +28,13 @@ public enum XmlWriteFeature implements FormatFeature
      */
     WRITE_XML_1_1(false),
 
+    /**
+     * Feature that controls whether XML declaration should include the standalone attribute
+     * when generator is initialized (true) or not (false). Only honored when
+     * {@link #WRITE_XML_DECLARATION WRITE_XML_DECLARATION} is enabled
+     */
+    WRITE_STANDALONE_YES_TO_XML_DECLARATION(false),
+
     /**
      * Feature that controls whether serialization of Java {@code null} values adds
      * XML attribute of `xsi:nil`, as defined by XML Schema (see

src/main/java/tools/jackson/dataformat/xml/deser/FromXmlParser.java

@@ -19,7 +19,6 @@
 import tools.jackson.core.io.NumberInput;
 import tools.jackson.core.util.ByteArrayBuilder;
 import tools.jackson.core.util.JacksonFeatureSet;
-import tools.jackson.dataformat.xml.XmlWriteFeature;
 import tools.jackson.dataformat.xml.util.CaseInsensitiveNameSet;
 import tools.jackson.dataformat.xml.util.StaxUtil;
 

src/main/java/tools/jackson/dataformat/xml/ser/ToXmlGenerator.java

@@ -173,15 +173,23 @@ public void initGenerator() throws JacksonException
         _initialized = true;
         try {
             boolean xmlDeclWritten;
-            if (XmlWriteFeature.WRITE_XML_1_1.enabledIn(_formatFeatures)) {
-                _xmlWriter.writeStartDocument("UTF-8", "1.1");
-                xmlDeclWritten = true;
-            } else if (XmlWriteFeature.WRITE_XML_DECLARATION.enabledIn(_formatFeatures)) {
-                _xmlWriter.writeStartDocument("UTF-8", "1.0");
+
+            if (XmlWriteFeature.WRITE_XML_1_1.enabledIn(_formatFeatures)
+                    || XmlWriteFeature.WRITE_XML_DECLARATION.enabledIn(_formatFeatures)) {
+
+                String xmlVersion = XmlWriteFeature.WRITE_XML_1_1.enabledIn(_formatFeatures) ? "1.1" : "1.0";
+                String encoding = "UTF-8";
+
+                if (XmlWriteFeature.WRITE_STANDALONE_YES_TO_XML_DECLARATION.enabledIn(_formatFeatures)) {
+                    _xmlWriter.writeStartDocument(xmlVersion, encoding, true);
+                } else {
+                    _xmlWriter.writeStartDocument(encoding, xmlVersion);
+                }
                 xmlDeclWritten = true;
             } else {
                 xmlDeclWritten = false;
             }
+
             // as per [dataformat-xml#172], try adding indentation
             if (xmlDeclWritten && (_xmlPrettyPrinter != null)) {
                 // ... but only if it is likely to succeed:

src/test/java/tools/jackson/dataformat/xml/misc/FailingNamespace326Test.java

@@ -8,18 +8,18 @@
 
 import com.ctc.wstx.stax.WstxInputFactory;
 import com.ctc.wstx.stax.WstxOutputFactory;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 import tools.jackson.databind.*;
 import tools.jackson.dataformat.xml.*;
 import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import tools.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 // for [dataformat-xml#326]
 public class FailingNamespace326Test extends XmlTestUtil
 {
-    @JacksonXmlRootElement(localName = "new")
+    @JsonRootName("new")
     static class Bean {
         @JacksonXmlProperty(isAttribute = true)
         public String source="ECOM";

src/test/java/tools/jackson/dataformat/xml/ser/TestNamespaces.java

@@ -8,7 +8,6 @@
 import tools.jackson.dataformat.xml.XmlMapper;
 import tools.jackson.dataformat.xml.XmlTestUtil;
 import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import tools.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -17,7 +16,7 @@ public class TestNamespaces extends XmlTestUtil
 {
     final static String CHILD_NS = "uri:child";
 
-    @JacksonXmlRootElement(localName="person", namespace="http://example.org/person" )
+    @JsonRootName(value="person", namespace="http://example.org/person" )
     static class Person
     {
         private String name;
@@ -63,9 +62,9 @@ static class ChildWithNsJsonProp {
     }
 
     /*
-    /**********************************************************
-    /* Unit tests
-    /**********************************************************
+    /**********************************************************************
+    /* Test methods
+    /**********************************************************************
      */
 
     private final XmlMapper MAPPER = newMapper();