Merge branch '2.11'

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -242,6 +242,8 @@ Project: jackson-databind
 #2658: Block one more gadget type (ignite-jta)
 #2659: Block one more gadget type (aries.transaction.jms)
  (reported by Srikanth Ramu)
+#2660: Block one more gadget type (caucho-quercus)
+ (reported by threedr3am)
 
 2.9.10.3 (23-Feb-2020)
 

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

@@ -149,7 +149,11 @@ public class SubTypeValidator
 
         // [databind#2659]: aries.transaction.jms
         s.add("org.apache.aries.transaction.jms.internal.XaPooledConnectionFactory");
+        s.add("org.apache.aries.transaction.jms.RecoverablePooledConnectionFactory");
 
+        // [databind#2660]: caucho-quercus
+        s.add("com.caucho.config.types.ResourceRef");
+        
         DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
     }