Merge branch '2.9'

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -11,7 +11,7 @@ Project: jackson-databind
  (reported by rue-jw@github)
 #1855: Blacklist for more serialization gadgets (dbcp/tomcat, spring)
 #1868: Class name handling for JDK unmodifiable Collection types changed
- (reported by Rob W)
+  (reported by Rob W)
 
 2.9.3 (09-Dec-2017)
 

src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java

@@ -193,7 +193,7 @@ public Boolean supportsUpdate(DeserializationConfig config) {
     /**********************************************************
      */
 
-    protected final Object finishBuild(DeserializationContext ctxt, Object builder)
+    protected Object finishBuild(DeserializationContext ctxt, Object builder)
             throws IOException
     {
         // As per [databind#777], allow returning builder itself

src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKCollectionsDeserTest.java

@@ -57,11 +57,10 @@ public void testUnmodifiableSet() throws Exception
         assertEquals("[\"java.util.Collections$UnmodifiableSet\",[\"a\"]]", json);
 
         // 04-Jan-2018, tatu: Alas, no way to make this actually work well, at this point.
-        //   In theory could jiggle things back on deser, using one of two ways:
-        //
-        //   1) Do mapping to regular Set/List types (abstract type mapping): would work, but get rid of immutability
-        //   2) Have actually separate deserializer OR ValueInstantiator
-        
+         //   In theory could jiggle things back on deser, using one of two ways:
+         //
+         //   1) Do mapping to regular Set/List types (abstract type mapping): would work, but get rid of immutability
+         //   2) Have actually separate deserializer OR ValueInstantiator
         /*
         Set<String> result = mapper.readValue(json, Set.class);
         assertNotNull(result);