commit e12eea63573848f5af1350ee09b97ada287e3a33
author Tatu Saloranta <tatu.saloranta@iki.fi> Thu Jun 13 20:31:06 2019 -0700
committer Tatu Saloranta <tatu.saloranta@iki.fi> Thu Jun 13 20:31:06 2019 -0700
tree 5901313bc9b7e5081a825bef399ed74cf91fe36e
parent f4ce9dcfe4d67e40c669a1b1d608b7b1b7e9292e
parent 862fca92390ff3ccd9124e9e27238c101b0f7cfe

Merge branch '2.8' into 2.9

release-notes/VERSION-2.x

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index cf177eb..fc309ce 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -7,6 +7,7 @@
 2.9.9.1 (not yet released)
 
 #2326: Block one more gadget type (CVE-2019-12384)
+#2341: Block one more gadget type (CVE-2019-12814)
 
 2.9.9 (16-May-2019)
 

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

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 271da41..79534ad 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
@@ -83,9 +83,13 @@
         // [databind#2326] (2.9.9)
         s.add("com.mysql.cj.jdbc.admin.MiniAdmin");
 
-        // [databind#2334] (2.9.9.1)
+        // [databind#2334]: logback-core (2.9.9.1)
         s.add("ch.qos.logback.core.db.DriverManagerConnectionSource");
 
+        // [databind#2341]: jdom/jdom2 (2.9.9.1)
+        s.add("org.jdom.transform.XSLTransformer");
+        s.add("org.jdom2.transform.XSLTransformer");
+
         DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
     }