Merge branch '2.19' into 2.x

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java

@@ -4,8 +4,6 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
-
 /**
  * General-purpose annotation used for configuring details of how
  * values of properties are to be serialized and deserialized.
@@ -19,7 +17,7 @@
  * or String (such as ISO-8601 compatible time value) -- as well as configuring
  * exact details with {@link #pattern} property.
  *<p>
- * As of Jackson 2.19, known special handling includes:
+ * As of Jackson 2.20, known special handling includes:
  *<ul>
  * <li>{@link java.util.Date} or {@link java.util.Calendar}: Shape can  be {@link Shape#STRING} or {@link Shape#NUMBER};
  *    pattern may contain {@link java.text.SimpleDateFormat}-compatible pattern definition.