Merge branch '2.10' into 2.11

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -97,6 +97,8 @@ Project: jackson-databind
  (reported by Topsec(tcc))
 #2698: Block one more gadget type (weblogic/oracle-aqjms)
  (reported by Fangrun Li)
+#2704: Block one more gadget type (weblogic/oracle-aqjms)
+ (reported by XuYuanzhen)
 
 2.9.10.4 (11-Apr-2020)
 

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

@@ -113,8 +113,10 @@ public class SubTypeValidator
         s.add("org.apache.commons.configuration.JNDIConfiguration");
         s.add("org.apache.commons.configuration2.JNDIConfiguration");
 
-        // [databind#2469]: xalan2
+        // [databind#2469]: xalan
         s.add("org.apache.xalan.lib.sql.JNDIConnectionPool");
+        // [databind#2704]: xalan2
+        s.add("com.sun.org.apache.xalan.internal.lib.sql.JNDIConnectionPool");
 
         // [databind#2478]: comons-dbcp, p6spy
         s.add("org.apache.commons.dbcp.datasources.PerUserPoolDataSource");