Merge branch '2.10'

cowtowncoder · cowtowncoder · commit 812a59881b02 · 2019-08-20T20:54:53.000-07:00
diff --git a/datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/DefaultTypingTest.java b/datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/DefaultTypingTest.java
@@ -26,7 +26,7 @@ public Validity validateBaseType(DatabindContext ctxt, JavaType baseType) {
     }
 
     private final ObjectMapper TYPING_MAPPER = newMapperBuilder()
-            .enableDefaultTyping(new NoCheckSubTypeValidator())
+            .activateDefaultTyping(new NoCheckSubTypeValidator())
             .build();
 
     // for [datatype-jsr310#24]

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public Validity validateBaseType(DatabindContext ctxt, JavaType baseType) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`private final ObjectMapper TYPING_MAPPER = newMapperBuilder()`
`29`		`- .enableDefaultTyping(new NoCheckSubTypeValidator())`
	`29`	`+ .activateDefaultTyping(new NoCheckSubTypeValidator())`
`30`	`30`	`.build();`
`31`	`31`
`32`	`32`	`// for [datatype-jsr310#24]`