Merge branch '2.9' into 2.10

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -117,6 +117,11 @@ Project: jackson-databind
   deserialize as "null value"
  (contributed by Martin C)
 
+2.9.10.1 (not yet released)
+
+#2478: Block two more gadget types (commons-dbcp, p6spy)
+ (reported by b5mali4 / [email protected])
+
 2.9.10 (21-Sep-2019)
 
 #2331: `JsonMappingException` through nested getter with generic wildcard return type

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java

@@ -112,6 +112,10 @@ public class SubTypeValidator
         // [databind#2469]: xalan2
         s.add("org.apache.xalan.lib.sql.JNDIConnectionPool");
 
+        // [databind#2478]: comons-dbcp, p6spy
+        s.add("org.apache.commons.dbcp.datasources.SharedPoolDataSource");
+        s.add("com.p6spy.engine.spy.P6DataSource");
+
         DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
     }