Merge branch '3.x' into tatu-claude/3.2/559-fix-xml-text-vs-creator

Author: cowtowncoder

.github/workflows/coverage-comment.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
     steps:
     - name: Download comment artifact
-      uses: dawidd6/action-download-artifact@8a338493df3d275e4a7a63bcff3b8fe97e51a927 # v19
+      uses: dawidd6/action-download-artifact@8305c0f1062bb0d184d09ef4493ecb9288447732 # v20
       with:
         name: pr-comment
         path: pr-comment/

.github/workflows/main.yml

@@ -56,40 +56,32 @@ jobs:
       run: ./mvnw -B -q -ff -ntp test jacoco:report
     - name: Publish code coverage
       if: ${{ matrix.release_build && github.event_name != 'pull_request' }}
-      uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
+      uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ./target/site/jacoco/jacoco.xml
         flags: unittests
     - name: Upload coverage report as artifact
       if: ${{ matrix.release_build && github.event_name != 'pull_request' }}
-      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
       with:
         name: jacoco-report
         path: target/site/jacoco/jacoco.csv
         retention-days: 30
     - name: Download base branch coverage
       if: ${{ matrix.release_build && github.event_name == 'pull_request' }}
-      uses: dawidd6/action-download-artifact@8a338493df3d275e4a7a63bcff3b8fe97e51a927 # v19
+      uses: dawidd6/action-download-artifact@8305c0f1062bb0d184d09ef4493ecb9288447732 # v20
       continue-on-error: true
       with:
         workflow: main.yml
         branch: ${{ github.event.pull_request.base.ref }}
         name: jacoco-report
         path: base-coverage/
-    - name: Generate coverage summary
-      if: ${{ matrix.release_build && github.event_name == 'pull_request' }}
-      id: jacoco
-      uses: cicirello/jacoco-badge-generator@72266185b7ee48a6fd74eaf0238395cc8b14fef8 # v2.12.1
-      with:
-        jacoco-csv-file: target/site/jacoco/jacoco.csv
-        generate-coverage-badge: false
-        generate-branches-badge: false
-        generate-summary: true
     - name: Generate coverage comment
       if: ${{ matrix.release_build && github.event_name == 'pull_request' }}
       run: |
-        # Helper functions
+        # Parse JaCoCo CSV to compute coverage percentage
+        # Columns: GROUP,PACKAGE,CLASS,INSTRUCTION_MISSED(4),INSTRUCTION_COVERED(5),BRANCH_MISSED(6),BRANCH_COVERED(7),...
         parse_coverage() {
           local csv_file=$1 col_missed=$2 col_covered=$3
           awk -F',' -v m="$col_missed" -v c="$col_covered" \
@@ -121,9 +113,9 @@ jobs:
           }'
         }
 
-        # Convert decimal to percentage and round to 1 decimal place
-        COVERAGE=$(awk -v cov="${{ steps.jacoco.outputs.coverage }}" 'BEGIN { printf "%.2f", cov * 100 }')
-        BRANCHES=$(awk -v br="${{ steps.jacoco.outputs.branches }}" 'BEGIN { printf "%.2f", br * 100 }')
+        # Compute current coverage from JaCoCo CSV
+        COVERAGE=$(parse_coverage "target/site/jacoco/jacoco.csv" 4 5)
+        BRANCHES=$(parse_coverage "target/site/jacoco/jacoco.csv" 6 7)
 
         # Check if base coverage artifact was downloaded and calculate deltas
         HAS_DELTA=false
@@ -174,7 +166,7 @@ jobs:
         echo "$COMMENT_BODY" > pr-comment/comment-body.txt
     - name: Upload PR comment
       if: ${{ matrix.release_build && github.event_name == 'pull_request' }}
-      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
       with:
         name: pr-comment
         path: pr-comment/

README.md

@@ -24,21 +24,21 @@ Specifically:
 | Type | Status |
 | ---- | ------ |
 | Build (CI) | [![Build (github)](https://github.com/FasterXML/jackson-dataformat-xml/actions/workflows/main.yml/badge.svg)](https://github.com/FasterXML/jackson-dataformat-xml/actions/workflows/main.yml) |
-| Artifact | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.fasterxml.jackson.dataformat/jackson-dataformat-xml) |
+| Artifact | [![Maven Central](https://img.shields.io/maven-central/v/tools.jackson.dataformat/jackson-dataformat-xml.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/tools.jackson.dataformat/jackson-dataformat-xml) |
 | OSS Sponsorship | [![Tidelift](https://tidelift.com/badges/package/maven/com.fasterxml.jackson.dataformat:jackson-dataformat-xml)](https://tidelift.com/subscription/pkg/maven-com-fasterxml-jackson-dataformat-jackson-dataformat-xml?utm_source=maven-com-fasterxml-jackson-dataformat-jackson-dataformat-xml&utm_medium=referral&utm_campaign=readme) |
-| Javadocs | [![Javadoc](https://javadoc.io/badge/com.fasterxml.jackson.dataformat/jackson-dataformat-xml.svg)](http://www.javadoc.io/doc/com.fasterxml.jackson.dataformat/jackson-dataformat-xml) |
+| Javadocs | [![Javadoc](https://javadoc.io/badge/tools.jackson.dataformat/jackson-dataformat-xml.svg)](http://www.javadoc.io/doc/tools.jackson.dataformat/jackson-dataformat-xml) |
 | Code coverage (2.19) | [![codecov.io](https://codecov.io/github/FasterXML/jackson-dataformat-xml/coverage.svg?branch=2.19)](https://codecov.io/github/FasterXML/jackson-dataformat-xml?branch=2.19) |
 | OpenSSF Score | [![OpenSSF  Scorecard](https://api.securityscorecards.dev/projects/github.com/FasterXML/jackson-dataformat-xml/badge)](https://securityscorecards.dev/viewer/?uri=github.com/FasterXML/jackson-dataformat-xml) |
 | Fuzzing | [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/jackson-dataformat-xml.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:jackson-dataformat-xml) |
 
 ## Branches
 
-`master` branch is for developing the next major Jackson version -- 3.0 -- but there
-are active maintenance branches in which much of development happens:
+`3.x` branch is for developing the next major Jackson version -- 3.2 -- but there
+are active maintenance branches for LTS releases:
 
-* `2.19` is for developing the next minor 2.x version
-* `2.18` is for backported fixes to include in 2.18.x patch versions
-* `2.17` is for backported fixes to include in 2.17.x patch versions
+* `3.1`
+* `2.21`
+* `2.18`
 
 Older branches are usually not changed but are available for historic reasons.
 All released versions have matching git tags (`jackson-dataformat-xml-2.17.1`).
@@ -49,21 +49,39 @@ All modules are licensed under [Apache License 2.0](http://www.apache.org/licens
 
 ## Maven dependency
 
+To use Jackson 3.x compatible version of this extension on Maven-based projects, use following dependency:
+
+Maven:
+```xml
+<dependency>
+  <groupId>tools.jackson.dataformat</groupId>
+  <artifactId>jackson-dataformat-xml</artifactId>
+  <version>3.1.1</version>
+</dependency>
+```
+
+Gradle:
+```groovy
+dependencies {
+    implementation 'tools.jackson.dataformat:jackson-dataformat-xml:3.1.1'
+}
+```
+
 To use Jackson 2.x compatible version of this extension on Maven-based projects, use following dependency:
 
 Maven:
 ```xml
 <dependency>
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformat-xml</artifactId>
-  <version>2.18.1</version>
+  <version>2.21.2</version>
 </dependency>
 ```
 
 Gradle:
 ```groovy
 dependencies {
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.18.1'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.2'
 }
 ```
 

release-notes/CREDITS

@@ -39,6 +39,15 @@ Christopher McVay (@mcvayc)
  * Fixed #306: Can not use `@JacksonXmlText` for Creator property (creator parameter)
   (3.2.0)
 
+Stefan Walter (@marvin9000)
+ * Requested #150: Allow specifying DOCTYPE declaration (`<!DOCTYPE root ...>`) to write
+  (3.2.0)
+
+Leonard Meyer (@LeonardMeyer)
+ * Reported #247: `@JacksonXmlRootElement` does not enforce the local name during
+  deserialization (add `XmlReadFeature.ENFORCE_ROOT_ELEMENT_NAME`)
+  (3.2.0)
+
 Tobias M (@lightbringer)
  * Reported #248: `@JacksonXmlProperty` with attributes raises an exception
    when used with `@JsonIdentityInfo`
@@ -47,16 +56,29 @@ Tobias M (@lightbringer)
 Eduard Wirch (@ewirch)
  * Reported #306: Can not use `@JacksonXmlText` for Creator property (creator parameter)
   (3.2.0)
+ * Requested #358: Allow skipping attributes from the `http://www.w3.org/2001/XMLSchema-instance`
+   namespace (with new `XmlReadFeature.SKIP_UNKNOWN_XSI_ATTRIBUTES`)
+  (3.2.0)
 
 Ruven Chu (@Chubacca)
  * Reported #334: `@JacksonXmlElementWrapper(useWrapping=false)` fails when using
    a `DeserializerModifier` that delegates
-  
+  (3.2.0)
+
+Florian Krauthan (@fkrauthan)
+ * Reported #448: Allow use of `@JsonRawValue` without wrapping element
+  (3.2.0)
+
 Lon Varscsak (@lonvarscsak)
  * Reported #449: Trouble dealing with JacksonXMLText if properties are present or
    if element is in a collection
   (3.2.0)
 
+Ondrej Zizka (@OndraZizka)
+ * Requested #452: Allow adding `<?xml-stylesheet ...>` declarations (Processing
+   Instructions)
+  (3.2.0)
+
 Jiri Mikulasek (@jimirocks)
  * Reported #455: Can't deserialize list in JsonSubtype when type property is visible
   (3.2.0)

release-notes/VERSION

@@ -15,9 +15,16 @@ Version: 3.x (for earlier see VERSION-2.x)
 #149: `@JacksonXmlElementWrapper` as a `@JsonCreator parameter` not working
  (reported by Dai M)
  (fix by Christopher M))
+#150: Allow specifying DOCTYPE declaration (`<!DOCTYPE root ...>`) to write
+ (requested by Stefan W)
+ (fix by @cowtowncoder)
 #192: Two wrapped lists with items of same name conflict
  (reported by @TeemuStenhammar)
  (fix by @cowtowncoder, w/ Claude code)
+#247: `@JacksonXmlRootElement` does not enforce the local name during
+  deserialization (add `XmlReadFeature.ENFORCE_ROOT_ELEMENT_NAME`)
+ (reported by Leonard M)
+ (fix by @cowtowncoder, w/ Claude code)
 #248: `@JacksonXmlProperty` with attributes raises an exception when used
   with `@JsonIdentityInfo`
  (reported by Tobias M)
@@ -33,14 +40,24 @@ Version: 3.x (for earlier see VERSION-2.x)
   a `DeserializerModifier` that delegates
  (reported by Ruven C)
  (fix by @cowtowncoder, w/ Claude code)
+#358: Allow skipping attributes from the `http://www.w3.org/2001/XMLSchema-instance`
+  namespace (with new `XmlReadFeature.SKIP_UNKNOWN_XSI_ATTRIBUTES`)
+ (requested by Eduard W)
+ (fix by @cowtowncoder, w/ Claude code)
 #426: `InvalidTypeIdException` when parsing XML to POJO containing nested `List<>`,
   custom `TypeIdResolver`
  (reported by @ankagar)
  (fix by @cowtowncoder, w/ Claude code)
+#448: Allow use of `@JsonRawValue` without wrapping element
+ (reported by Florian K)
 #449: Trouble dealing with JacksonXMLText if properties are present or
   if element is in a collection
  (reported by Lon V)
  (fix by @cowtowncoder, w/ Claude code)
+#452: Allow adding `<?xml-stylesheet ...>` declarations (Processing
+  Instructions)
+ (requested by Ondrej Z)
+ (fix by @cowtowncoder)
 #455: Can't deserialize list in JsonSubtype when type property is visible
  (reported by Jiri M)
  (fix by @cowtowncoder, w/ Claude code)
@@ -104,6 +121,19 @@ Version: 3.x (for earlier see VERSION-2.x)
 #802: Serialization with Polymorphisme and `EXTERNAL_PROPERTY` = duplicate property
  (reported by @ Adrien-dev25 )
  (fix by @cowtowncoder, w/ Claude code)
+#845: Implement `JsonGenerator` methods `writeComment()` and `canWriteComments()`
+ (implemented by @cowtowncoder, w/ Claude code)
+#849: Allow writing Comments in Document Prolog (before root element)
+ (implemented by @cowtowncoder)
+#853: `InvalidDefinitionException` on classes using
+  `@JacksonXmlElementWrapper` and `@JacksonXmlProperty`
+ (reported by @soc)
+ (fix by @cowtowncoder, w/ Claude code)
+
+3.1.2 (11-Apr-2026)
+3.1.1 (27-Mar-2026)
+
+No changes since 3.1.0
 
 3.1.0 (23-Feb-2026)
 

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

@@ -475,7 +475,6 @@ public boolean isEnabled(XmlWriteFeature f) {
         return _serializationConfig.hasFormatFeature(f);
     }
 
-
     /*
     /**********************************************************************
     /* XML-specific access
@@ -497,7 +496,8 @@ public FromXmlParser createParser(XMLStreamReader r) throws IOException {
      */
     public ToXmlGenerator createGenerator(XMLStreamWriter w) throws IOException {
         SerializationContextExt prov = _serializationContext(serializationConfig());
-        return tokenStreamFactory().createGenerator(prov, w);
+        return (ToXmlGenerator) _initializeGenerator(
+                tokenStreamFactory().createGenerator(prov, w));
     }
 
     /**

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

@@ -42,6 +42,24 @@ public enum XmlReadFeature implements FormatFeature
      */
     EMPTY_ELEMENT_AS_NULL(false),
 
+    /**
+     * Feature that controls whether the name of the root XML element is
+     * verified against the expected root name during deserialization. The expected
+     * root name is determined from {@code @JsonRootName}, {@code @JacksonXmlRootElement},
+     * or the simple class name of the target type (in that priority order).
+     *<p>
+     * When enabled, a mismatch between the actual root element name and the expected
+     * name will result in a {@link tools.jackson.databind.exc.MismatchedInputException}.
+     * When disabled (the default), any root element name is accepted.
+     * Note that Fully-Qualified Names (FQN) comparison is used: that is, both local name
+     * and namespace URI must match.
+     *<p>
+     * Default setting is {@code false} for backwards-compatibility.
+     *
+     * @since 3.2
+     */
+    ENFORCE_ROOT_ELEMENT_NAME(false),
+
     /**
      * Feature that indicates whether XML Schema Instance attribute
      * {@code xsi:nil} will be processed automatically -- to indicate {@code null}
@@ -55,6 +73,24 @@ public enum XmlReadFeature implements FormatFeature
      */
     PROCESS_XSI_NIL(true),
 
+    /**
+     * Feature that controls whether XML Schema Instance (XSI) namespace attributes
+     * other than {@code xsi:nil} and {@code xsi:type} (which have their own handling
+     * via {@link #PROCESS_XSI_NIL} and {@link #AUTO_DETECT_XSI_TYPE}) are silently
+     * skipped during deserialization. Attributes affected include {@code xsi:schemaLocation}
+     * and {@code xsi:noNamespaceSchemaLocation}.
+     *<p>
+     * When enabled, these attributes are ignored and will not cause
+     * {@code UnrecognizedPropertyException}. When disabled (default), they are
+     * exposed as regular attributes and may require matching POJO properties
+     * or {@code DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES} to be disabled.
+     *<p>
+     * Default setting is {@code false}.
+     *
+     * @since 3.2
+     */
+    SKIP_UNKNOWN_XSI_ATTRIBUTES(false),
+
     ;
 
     private final boolean _defaultState;

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

@@ -27,9 +27,10 @@
  */
 public class XmlTypeResolverBuilder extends StdTypeResolverBuilder
 {
-    public XmlTypeResolverBuilder(JsonTypeInfo.Value typeInfo)
+    public XmlTypeResolverBuilder(JsonTypeInfo.Value typeInfo,
+            JavaType detectedBaseType)
     {
-        super(typeInfo);
+        super(typeInfo, detectedBaseType);
     }
 
     @Override

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

@@ -14,9 +14,10 @@ public class XmlTypeResolverProvider
 {
     private static final long serialVersionUID = 3L;
 
-    @Override
+    @Override // @since 3.2
     protected TypeResolverBuilder<?> _constructStdTypeResolverBuilder(MapperConfig<?> config,
-            JsonTypeInfo.Value typeInfo, JavaType baseType) {
-        return new XmlTypeResolverBuilder(typeInfo);
+            JsonTypeInfo.Value typeInfo, JavaType baseType,
+            JavaType detectedBaseType) {
+        return new XmlTypeResolverBuilder(typeInfo, detectedBaseType);
     }
 }