Merge branch '2.12'

Author: cowtowncoder

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestOffsetDateTimeDeserialization.java

@@ -133,8 +133,7 @@ public void testDeserializationAsArrayDisabled() throws Throwable
             READER.readValue("['2000-01-01T12:00+00']");
     		    fail("expected JsonMappingException");
         } catch (JsonMappingException e) {
-            verifyException(e, "Cannot deserialize");
-            verifyException(e, "START_ARRAY token");
+            verifyException(e, "Cannot deserialize value of type `java.time.OffsetDateTime` from Array value");
         }
     }
 
@@ -145,8 +144,7 @@ public void testDeserializationAsEmptyArrayDisabled() throws Throwable
             READER.readValue("[]");
             fail("expected JsonMappingException");
         } catch (JsonMappingException e) {
-            verifyException(e, "Cannot deserialize");
-            verifyException(e, "START_ARRAY token");
+            verifyException(e, "Cannot deserialize value of type `java.time.OffsetDateTime` from Array value");
         }
         try {
     		    READER.with(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/DurationDeserTest.java

@@ -329,10 +329,7 @@ public void testDeserializationAsEmptyArrayDisabled() throws Throwable
             READER.readValue("[]");
             fail("expected MismatchedInputException");
         } catch (MismatchedInputException e) {
-            // 17-Aug-2019, tatu: Message differs between 2.10 and 3.0...
-            verifyException(e, "Cannot deserialize value of type");
-            verifyException(e, "java.time.Duration");
-            verifyException(e, "out of START_ARRAY");
+            verifyException(e, "Cannot deserialize value of type `java.time.Duration` from Array value");
         }
         try {
             READER.with(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/ZoneOffsetDeserTest.java

@@ -95,8 +95,7 @@ public void testDeserializationAsArrayDisabled() throws Throwable
             READER.readValue("[\"+0300\"]");
             fail("expected MismatchedInputException");
         } catch (MismatchedInputException e) {
-            verifyException(e, "Cannot deserialize");
-            verifyException(e, "out of START_ARRAY");
+            verifyException(e, "Cannot deserialize value of type `java.time.ZoneOffset` from Array value");
         }
     }
 
@@ -107,8 +106,7 @@ public void testDeserializationAsEmptyArrayDisabled() throws Throwable
             READER.readValue("[]");
             fail("expected MismatchedInputException");
         } catch (MismatchedInputException e) {
-            verifyException(e, "Cannot deserialize");
-            verifyException(e, "out of START_ARRAY");
+            verifyException(e, "Cannot deserialize value of type `java.time.ZoneOffset` from Array value");
         }
         try {
             READER

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/failing/LocalDateDeserTest.java

@@ -24,6 +24,6 @@ public StrictWrapper() { }
     @Test(expected = InvalidFormatException.class)
     public void testStrictCustomFormat() throws Exception
     {
-        StrictWrapper w = MAPPER.readValue("{\"value\":\"2019-11-31\"}", StrictWrapper.class);
+        /*StrictWrapper w =*/ MAPPER.readValue("{\"value\":\"2019-11-31\"}", StrictWrapper.class);
     }
 }