Merge branch '2.x' into 3.0

Author: cowtowncoder

src/main/java/tools/jackson/databind/deser/ValueInstantiator.java

@@ -4,6 +4,7 @@
 import java.math.BigInteger;
 
 import tools.jackson.core.JacksonException;
+
 import tools.jackson.databind.*;
 import tools.jackson.databind.deser.bean.PropertyValueBuffer;
 import tools.jackson.databind.introspect.AnnotatedWithParams;

src/main/java/tools/jackson/databind/deser/bean/PropertyBasedCreator.java

@@ -4,6 +4,7 @@
 
 import tools.jackson.core.JacksonException;
 import tools.jackson.core.JsonParser;
+
 import tools.jackson.databind.*;
 import tools.jackson.databind.deser.SettableAnyProperty;
 import tools.jackson.databind.deser.SettableBeanProperty;

src/main/java/tools/jackson/databind/deser/bean/PropertyValueBuffer.java

@@ -100,9 +100,6 @@ public class PropertyValueBuffer
     /**********************************************************************
      */
 
-    /**
-     * @since 2.18
-     */
     public PropertyValueBuffer(JsonParser p, DeserializationContext ctxt, int paramCount,
             ObjectIdReader oir, SettableAnyProperty anyParamSetter)
     {
@@ -124,13 +121,6 @@ public PropertyValueBuffer(JsonParser p, DeserializationContext ctxt, int paramC
         }
     }
 
-    @Deprecated // since 2.18
-    public PropertyValueBuffer(JsonParser p, DeserializationContext ctxt, int paramCount,
-            ObjectIdReader oir)
-    {
-        this(p, ctxt, paramCount, oir, null);
-    }
-
     /**
      * Returns {@code true} if the given property was seen in the JSON source by
      * this buffer.