Merge branch '2.10' into 2.11

Author: cowtowncoder

pom.xml

@@ -87,7 +87,7 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
     <dependency>
       <groupId>com.fasterxml.woodstox</groupId>
       <artifactId>woodstox-core</artifactId>
-      <version>6.2.1</version>
+      <version>6.2.3</version>
       <exclusions>
         <exclusion>
 	  <groupId>javax.xml.stream</groupId>

release-notes/VERSION-2.x

@@ -4,6 +4,10 @@ Project: jackson-dataformat-xml
 = Releases
 ------------------------------------------------------------------------
 
+(unreleased changes)
+
+- Upgrade Woodstox dependency to 6.2.3 (<- 6.2.1)
+
 2.11.3 (02-Oct-2020)
 2.11.2 (02-Aug-2020)
 

src/test/java/com/fasterxml/jackson/dataformat/xml/misc/BadEncodingTest.java

@@ -0,0 +1,25 @@
+package com.fasterxml.jackson.dataformat.xml.misc;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import com.fasterxml.jackson.dataformat.xml.XmlTestBase;
+
+// [dataformat-xml#428]: problem with an encoding supported via JDK
+public class BadEncodingTest extends XmlTestBase
+{
+//    private static final String xml = "<?xml version='1.0' encoding='WINDOWS-1252'?><x/>";
+    private static final String xml = "<?xml version='1.0' encoding='WINDOWS-1252'?><x/>";
+
+    private final ObjectMapper XML_MAPPER = newMapper();
+
+    public void testEncoding() throws Exception {
+        final byte[] b = xml.getBytes("UTF-8");
+        assertNotNull(XML_MAPPER.readValue(b, Map.class));
+
+//        try (InputStream in = new ByteArrayInputStream(b)) {
+//            XML_MAPPER.readValue(in, Map.class);
+//        }
+    }
+}