Merge branch '2.9' into 2.10

cowtowncoder · cowtowncoder · commit f3cba27c3b75 · 2020-03-15T18:11:07.000-07:00
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -197,6 +197,8 @@ Project: jackson-databind
 #2648: Block one more gadget type (shiro-core)
 #2653: Block one more gadget type (shiro-core)
 #2658: Block one more gadget type (ignite-jta)
+#2659: Block one more gadget type (aries.transaction.jms)
+ (reported by Srikanth Ramu)
 
 2.9.10.3 (23-Feb-2020)
 
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
@@ -147,6 +147,9 @@ public class SubTypeValidator
         s.add("org.apache.ignite.cache.jta.jndi.CacheJndiTmFactory");
         s.add("org.quartz.utils.JNDIConnectionProvider");
 
+        // [databind#2659]: aries.transaction.jms
+        s.add("org.apache.aries.transaction.jms.internal.XaPooledConnectionFactory");
+
         DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,9 @@ public class SubTypeValidator`
`147`	`147`	`s.add("org.apache.ignite.cache.jta.jndi.CacheJndiTmFactory");`
`148`	`148`	`s.add("org.quartz.utils.JNDIConnectionProvider");`
`149`	`149`
	`150`	`+ // [databind#2659]: aries.transaction.jms`
	`151`	`+ s.add("org.apache.aries.transaction.jms.internal.XaPooledConnectionFactory");`
	`152`	`+`
`150`	`153`	`DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);`
`151`	`154`	`}`
`152`	`155`