Merge branch '2.16' into 2.17

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -6,8 +6,6 @@ Project: jackson-databind
 
 2.17.0 (not yet released)
 
-#4200: `JsonSetter(contentNulls = FAIL)` is ignored in delegating
-  `@JsonCreator` argument
 #4205: Consider types in `sun.*` package(s) to be JDK (platform) types
   for purposes of handling
 #4209: Make `BeanDeserializerModifier`/`BeanSerializerModifier`
@@ -19,6 +17,8 @@ Project: jackson-databind
 
 2.16.1 (not yet released)
 
+#4200: `JsonSetter(contentNulls = FAIL)` is ignored in delegating
+  `@JsonCreator` argument
 #4216: Primitive array deserializer cannot being captured by `DeserializerModifier`
  (reported by @SakuraKoi)
  (fix contributed by Joo-Hyuk K)

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

@@ -743,7 +743,7 @@ private JsonDeserializer<Object> _findDelegateDeserializer(DeserializationContex
      * needed to find {@link PropertyMetadata} for Delegating Creator,
      * for access to annotation-derived info.
      *
-     * @since 2.17
+     * @since 2.16.1
      */
     protected PropertyMetadata _getSetterInfo(DeserializationContext ctxt,
             AnnotatedMember accessor, JavaType type)
@@ -793,7 +793,7 @@ protected PropertyMetadata _getSetterInfo(DeserializationContext ctxt,
         }
         return metadata;
     }
-    
+
     /**
      * Helper method that can be used to see if specified property is annotated
      * to indicate use of a converter for property value (in case of container types,