Merge branch '2.11'

Author: cowtowncoder

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/key/ZonedDateTimeAsKeyTest.java

@@ -77,15 +77,15 @@ public void testDeserialization2() throws Exception {
 
     @Test
     public void testSerializationToInstantWithNanos() throws Exception {
-        String value = newMapperBuilder().enable(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS).build()
+        String value = mapperBuilder().enable(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS).build()
             .writerFor(TYPE_REF).writeValueAsString(asMap(DATE_TIME_1, "test"));
         Assert.assertEquals("Value is incorrect",
             mapAsString(String.valueOf(DATE_TIME_1.toEpochSecond()) + '.' + DATE_TIME_1.getNano(), "test"), value);
     }
 
     @Test
     public void testSerializationToInstantWithoutNanos() throws Exception {
-        String value = newMapperBuilder().enable(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS)
+        String value = mapperBuilder().enable(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS)
             .disable(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS).build()
             .writerFor(TYPE_REF).writeValueAsString(asMap(DATE_TIME_1, "test"));
         Assert.assertEquals("Value is incorrect",

release-notes/CREDITS-2.x

@@ -77,7 +77,11 @@ Michael O'Keeffe (kupci@github)
 Michał Żmuda (zmumi@github)
   * Reported #127: ZonedDateTime in map keys ignores option to write Zone IDs
    (2.10.1)
+  * Reported #128: Timestamp keys from `ZonedDateTime`
+   (2.11.0)
 
 Vetle Leinonen-Roeim (vetler@github)
   * Contributed fix for #127: ZonedDateTime in map keys ignores option to write Zone IDs
    (2.10.1)
+  * Contributed fix for #128: Timestamp keys from `ZonedDateTime`
+   (2.11.0)

release-notes/VERSION-2.x

@@ -10,7 +10,8 @@ Modules:
 
 2.11.0 (not yet released)
 
--
+#128: Timestamp keys from `ZonedDateTime`
+ (reported by Michał Ż, fixed by Vetle L-R)
 
 2.10.1 (not yet released)