Update master to 2.8.0-SNAPSHOT

Author: cowtowncoder

pom.xml

@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.fasterxml.jackson</groupId>
     <artifactId>jackson-parent</artifactId>
-    <version>2.7</version>
+    <version>2.8-rc1-SNAPSHOT</version>
   </parent>
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformat-xml</artifactId>
-  <version>2.7.5-SNAPSHOT</version>
+  <version>2.8.0-SNAPSHOT</version>
   <name>Jackson-dataformat-XML</name>
   <packaging>bundle</packaging>
   <description>Data format extension for Jackson (http://jackson.codehaus.org) to offer
@@ -24,13 +24,9 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
     <tag>HEAD</tag>
   </scm>
   <properties>
-    <version.jackson.core>2.7.4</version.jackson.core>
+    <version.jackson.core>2.8.0-SNAPSHOT</version.jackson.core>
     <version.jackson.jaxb>${version.jackson.core}</version.jackson.jaxb>
 
-    <!-- 23-Feb-2016, tatu: Try to keep JDK6 runtime for 2.7 at least -->
-    <javac.src.version>1.6</javac.src.version>
-    <javac.target.version>1.6</javac.target.version>
-
     <packageVersion.dir>com/fasterxml/jackson/dataformat/xml</packageVersion.dir>
     <packageVersion.package>${project.groupId}.xml</packageVersion.package>
 
@@ -86,10 +82,18 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
           has odd issues. Let's default to Woodstox: caller can upgrade to Aalto
          (needs to block this dep)
       -->
+    <!-- 09-May-2016, tatu: With Jackson 2.8, let's make this compile-dep to make it
+        less likely users accidentally try to use Sjsxp from JDK, which leads to probs
+      -->
     <dependency>
       <groupId>com.fasterxml.woodstox</groupId>
       <artifactId>woodstox-core</artifactId>
       <version>5.0.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/main/java/com/fasterxml/jackson/dataformat/xml/XmlMapper.java

@@ -235,12 +235,10 @@ public void writeValue(XMLStreamWriter w0, Object value) throws IOException {
     /**********************************************************
      */
 
-    /**
-     * XML indentation differs from JSON indentation, thereby
-     * need to change default pretty-printer
-     */
+    // 09-May-2016, tatu: Was removed from `jackson-databind` in 2.8; remove from
+    //    here in 2.9.
     @Deprecated // since 2.6
-    @Override
+//    @Override
     protected PrettyPrinter _defaultPrettyPrinter() {
         return new DefaultXmlPrettyPrinter();
     }

src/main/java/com/fasterxml/jackson/dataformat/xml/XmlTypeResolverBuilder.java

@@ -126,12 +126,6 @@ public String idFromValue(Object value)
             return encodeXmlClassName(super.idFromValue(value));
         }
 
-        @SuppressWarnings("deprecation")
-        @Override
-        public JavaType typeFromId(String id) {
-            return super.typeFromId(decodeXmlClassName(id));
-        }
-
         @Override
         public JavaType typeFromId(DatabindContext context, String id) {
             return super.typeFromId(context, decodeXmlClassName(id));
@@ -152,12 +146,6 @@ public String idFromValue(Object value)
             return encodeXmlClassName(super.idFromValue(value));
         }
 
-        @SuppressWarnings("deprecation")
-        @Override
-        public JavaType typeFromId(String id) {
-            return super.typeFromId(decodeXmlClassName(id));
-        }
-
         @Override
         public JavaType typeFromId(DatabindContext context, String id) {
             return super.typeFromId(context, decodeXmlClassName(id));

src/main/java/com/fasterxml/jackson/dataformat/xml/ser/UnwrappingXmlBeanSerializer.java

@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.dataformat.xml.ser;
 
 import java.io.IOException;
+import java.util.Set;
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
@@ -55,7 +56,7 @@ public UnwrappingXmlBeanSerializer(UnwrappingXmlBeanSerializer src, ObjectIdWrit
         _nameTransformer = src._nameTransformer;
     }
 
-    protected UnwrappingXmlBeanSerializer(UnwrappingXmlBeanSerializer src, String[] toIgnore)
+    protected UnwrappingXmlBeanSerializer(UnwrappingXmlBeanSerializer src, Set<String> toIgnore)
     {
         super(src, toIgnore);
         _nameTransformer = src._nameTransformer;
@@ -92,9 +93,8 @@ public BeanSerializerBase withFilterId(Object filterId)
         return new UnwrappingXmlBeanSerializer(this, _objectIdWriter, filterId);
     }
 
-    @Override
-    protected BeanSerializerBase withIgnorals(String[] toIgnore)
-    {
+    @Override // since 2.8
+    protected BeanSerializerBase withIgnorals(Set<String> toIgnore) {
         return new UnwrappingXmlBeanSerializer(this, toIgnore);
     }
 
@@ -103,8 +103,7 @@ protected BeanSerializerBase withIgnorals(String[] toIgnore)
      * so implementation will simply return 'this'.
      */
     @Override
-    protected BeanSerializerBase asArraySerializer()
-    {
+    protected BeanSerializerBase asArraySerializer() {
         return this;
     }
 

src/main/java/com/fasterxml/jackson/dataformat/xml/ser/XmlBeanSerializer.java

@@ -1,9 +1,9 @@
 package com.fasterxml.jackson.dataformat.xml.ser;
 
 import java.io.IOException;
+import java.util.Set;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
@@ -39,7 +39,7 @@ public XmlBeanSerializer(XmlBeanSerializerBase src, ObjectIdWriter objectIdWrite
         super(src, objectIdWriter);
     }
 
-    public XmlBeanSerializer(XmlBeanSerializerBase src, String[] toIgnore) {
+    public XmlBeanSerializer(XmlBeanSerializerBase src, Set<String> toIgnore) {
         super(src, toIgnore);
     }
 
@@ -49,7 +49,6 @@ public XmlBeanSerializer(XmlBeanSerializerBase src, String[] toIgnore) {
     /**********************************************************
      */
 
-
     @Override
     public JsonSerializer<Object> unwrappingSerializer(NameTransformer unwrapper) {
         return new UnwrappingXmlBeanSerializer(this, unwrapper);
@@ -66,7 +65,7 @@ public BeanSerializerBase withFilterId(Object filterId) {
     }
 
     @Override
-    protected BeanSerializerBase withIgnorals(String[] toIgnore) {
+    protected BeanSerializerBase withIgnorals(Set<String> toIgnore) {
         return new XmlBeanSerializer(this, toIgnore);
     }
 

src/main/java/com/fasterxml/jackson/dataformat/xml/ser/XmlBeanSerializerBase.java

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.BitSet;
+import java.util.Set;
 
 import javax.xml.namespace.QName;
 
@@ -123,7 +124,7 @@ protected XmlBeanSerializerBase(XmlBeanSerializerBase src, ObjectIdWriter object
         _cdata = src._cdata;
     }
 
-    protected XmlBeanSerializerBase(XmlBeanSerializerBase src, String[] toIgnore)
+    protected XmlBeanSerializerBase(XmlBeanSerializerBase src, Set<String> toIgnore)
     {
         super(src, toIgnore);
         _attributeCount = src._attributeCount;