Merge branch '2.19'

Author: cowtowncoder

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

@@ -96,7 +96,6 @@ protected BeanSerializerBase asArraySerializer()
          * - have any getter
          */
         if ((_objectIdWriter == null)
-                && (_anyGetterWriter == null)
                 && (_propertyFilterId == null)
                 ) {
             return new BeanAsArraySerializer(this);

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

@@ -217,12 +217,6 @@ protected void _serializeProperties(Object bean, JsonGenerator gen0, Serializati
                     xgen.setNextIsUnwrapped(false);
                 }
             }
-            if (_anyGetterWriter != null) {
-                // For [#117]: not a clean fix, but with @JsonTypeInfo, we'll end up
-                // with accidental attributes otherwise
-                xgen.setNextIsAttribute(false);
-                _anyGetterWriter.getAndSerialize(bean, xgen, ctxt);
-            }
         } catch (Exception e) {
             String name = (i == props.length) ? "[anySetter]" : props[i].getName();
             wrapAndThrow(ctxt, e, bean, name);
@@ -297,13 +291,6 @@ protected void _serializePropertiesFiltered(Object bean, JsonGenerator gen0,
                     xgen.setNextIsUnwrapped(false);
                 }
             }
-            if (_anyGetterWriter != null) {
-                // For [#117]: not a clean fix, but with @JsonTypeInfo, we'll end up
-                // with accidental attributes otherwise
-                xgen.setNextIsAttribute(false);
-                // 24-Jul-2019, tatu: Fixed for [dataformat-xml#351]
-                _anyGetterWriter.getAndFilter(bean, xgen, ctxt, filter);
-            }
         } catch (Exception e) {
             String name = (i == props.length) ? "[anySetter]" : props[i].getName();
             wrapAndThrow(ctxt, e, bean, name);