aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/fasterxml
diff options
context:
space:
mode:
authorTatu Saloranta <tatu.saloranta@iki.fi>2020-04-24 20:39:27 -0700
committerTatu Saloranta <tatu.saloranta@iki.fi>2020-04-24 20:39:27 -0700
commitf0430de160706ff6c3643100d02f1ad4d93ba51a (patch)
tree8d70a3788315092f78f1175fe2a9d2aea73afec3 /src/main/java/com/fasterxml
parent419d7717cf90689614057b1a90ddcbfd5f3a7e1b (diff)
parent5c8642aeae9c756b438ab7637c90ef3c77966e6e (diff)
downloadjackson-databind-f0430de160706ff6c3643100d02f1ad4d93ba51a.tar.gz
Merge branch '2.9' into 2.10
Diffstat (limited to 'src/main/java/com/fasterxml')
-rw-r--r--src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java9
1 files changed, 9 insertions, 0 deletions
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 52911ec18..577ed4794 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
@@ -183,6 +183,15 @@ public class SubTypeValidator
// [databind#2688]: apache/drill
s.add("oadd.org.apache.xalan.lib.sql.JNDIConnectionPool");
+ // [databind#2698]: weblogic w/ oracle/aq-jms
+ // (note: dependency not available via Maven Central, but as part of
+ // weblogic installation, possibly fairly old version(s))
+ s.add("oracle.jms.AQjmsQueueConnectionFactory");
+ s.add("oracle.jms.AQjmsXATopicConnectionFactory");
+ s.add("oracle.jms.AQjmsTopicConnectionFactory");
+ s.add("oracle.jms.AQjmsXAQueueConnectionFactory");
+ s.add("oracle.jms.AQjmsXAConnectionFactory");
+
DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
}