Merge branch '2.10' into 2.11

cowtowncoder · cowtowncoder · commit 9a1255e8c89d · 2020-12-15T17:30:52.000-08:00
diff --git a/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java b/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java
@@ -207,6 +207,10 @@ public class SubTypeValidator
         s.add("com.nqadmin.rowset.JdbcRowSetImpl");
         s.add("org.arrah.framework.rdbms.UpdatableJdbcRowsetImpl");
 
+        // [databind#2986]: dbcp2
+        s.add("org.apache.commons.dbcp2.datasources.PerUserPoolDataSource");
+        s.add("org.apache.commons.dbcp2.datasources.SharedPoolDataSource");
+
         DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,10 @@ public class SubTypeValidator`
`207`	`207`	`s.add("com.nqadmin.rowset.JdbcRowSetImpl");`
`208`	`208`	`s.add("org.arrah.framework.rdbms.UpdatableJdbcRowsetImpl");`
`209`	`209`
	`210`	`+ // [databind#2986]: dbcp2`
	`211`	`+ s.add("org.apache.commons.dbcp2.datasources.PerUserPoolDataSource");`
	`212`	`+ s.add("org.apache.commons.dbcp2.datasources.SharedPoolDataSource");`
	`213`	`+`
`210`	`214`	`DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);`
`211`	`215`	`}`
`212`	`216`