Merge branch '2.9' into 2.10
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index c695001..06e6968 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -192,19 +192,19 @@
(reported by threedr3am & LFY)
#2634: Block two more gadget types (ibatis-sqlmap, anteros-core; CVE-2020-9547 / CVE-2020-9548)
(reported by threedr3am & V1ZkRA)
-#2642: Block one more gadget type (javax.swing, CVE-to-be-allocated)
+#2642: Block one more gadget type (javax.swing, CVE-2020-10969)
(reported by threedr3am)
#2648: Block one more gadget type (shiro-core)
#2653: Block one more gadget type (shiro-core)
#2658: Block one more gadget type (ignite-jta, CVE-2020-10650)
(reported by Srikanth Ramu, threedr3am'follower)
-#2659: Block one more gadget type (aries.transaction.jms)
+#2659: Block one more gadget type (aries.transaction.jms, CVE-2020-10672)
(reported by Srikanth Ramu)
#2660: Block one more gadget type (caucho-quercus, CVE-2020-10673)
(reported by threedr3am'follower)
-#2662: Block one more gadget type (bus-proxy)
+#2662: Block one more gadget type (bus-proxy, CVE-2020-10968)
(reported by XuYuanzhen)
-#2664: Block one more gadget type (activemq)
+#2664: Block one more gadget type (activemq-pool[-jms])
(reported by Srikanth Ramu)
#2666: Block one more gadget type (apache/commons-proxy)
(reported by Yiting Fan)
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
index f41e60a..d662954 100644
--- a/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java
+++ b/src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java
@@ -158,9 +158,18 @@
s.add("org.aoju.bus.proxy.provider.RmiProvider");
s.add("org.aoju.bus.proxy.provider.remoting.RmiProvider");
- // [databind#2664]: activemq-jms
- s.add("org.apache.activemq.jms.pool.XaPooledConnectionFactory");
+ // [databind#2664]: activemq-core, activemq-pool, activemq-pool-jms
+ s.add("org.apache.activemq.ActiveMQConnectionFactory"); // core
+ s.add("org.apache.activemq.ActiveMQXAConnectionFactory");
+ s.add("org.apache.activemq.spring.ActiveMQConnectionFactory");
+ s.add("org.apache.activemq.spring.ActiveMQXAConnectionFactory");
+ s.add("org.apache.activemq.pool.JcaPooledConnectionFactory"); // pool
+ s.add("org.apache.activemq.pool.PooledConnectionFactory");
+ s.add("org.apache.activemq.pool.XaPooledConnectionFactory");
+ s.add("org.apache.activemq.jms.pool.XaPooledConnectionFactory"); // pool-jms
+ s.add("org.apache.activemq.jms.pool.JcaPooledConnectionFactory");
+
// [databind#2666]: apache/commons-jms
s.add("org.apache.commons.proxy.provider.remoting.RmiProvider");