Merge branch '2.11' into 2.12

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -61,6 +61,11 @@ Luke Korth ([email protected])
 * Reported #366: XML containing xsi:nil is improperly parsed
  (2.10.2)
 
+Martin Vysny (mvysny@github)
+
+* Reported #395: Namespace repairing generates xmlns definitions for xml: prefix (which is implicit)
+ (2.10.5)
+
 Alexei Volkov (softkot@github)
 
 * Reported #294: XML parser error with nested same element names

release-notes/VERSION-2.x

@@ -30,7 +30,9 @@ No changes since 2.10.x
 
 2.10.5 (not yet released)
 
--
+#395: Namespace repairing generates xmlns definitions for xml: prefix (which is implicit)
+ (reported by Martin V)
+- Upgrade Woodstox dependency to 6.2.0 (minor fix to namespace binding)
 
 2.10.4 (03-May-2020)
 

src/test/java/com/fasterxml/jackson/dataformat/xml/ser/TestNamespaces.java

@@ -18,26 +18,41 @@ public void setName(String name) {
             this.name = name;
         }
     }
-    
+
+    static class Issue395 {
+        @JacksonXmlProperty(isAttribute = true, namespace = "http://www.w3.org/XML/1998/namespace",
+                localName = "lang")
+        public String lang = "en-US";
+    }
+
     /*
     /**********************************************************
     /* Unit tests
     /**********************************************************
      */
-    
-    // [Issue-26]: should prefer the "default namespace"
+
+    private final XmlMapper MAPPER = newMapper();
+
+    // [dataformat-xml#26]: should prefer the "default namespace"
     public void testRootNamespace() throws Exception
     {
         Person person = new Person();
         person.setName( "hello" );
 
-        XmlMapper xmlMapper = new XmlMapper();
-        String xml = xmlMapper.writeValueAsString(person);
+        String xml = MAPPER.writeValueAsString(person);
 
         // should use "the default namespace"...
         final String PREFIX = "<person xmlns=";
         if (!xml.startsWith(PREFIX)) {
             fail("Expected XML to begin with '"+PREFIX+"', instead got: "+xml);
         }
     }
+
+    // [dataformat-xml#395]: should not bind standard `xml` namespace to anything
+    public void testXmlNs() throws Exception
+    {
+        String xml = MAPPER.writeValueAsString(new Issue395());
+//        System.err.println("XML: "+xml);
+        assertEquals("<Issue395 xml:lang=\"en-US\"/>", xml.trim());
+    }
 }