Merge branch '2.9' into 2.10

cowtowncoder · cowtowncoder · commit c8e58d3c9446 · 2020-12-26T14:21:47.000-08:00
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
@@ -226,6 +226,10 @@ public class SubTypeValidator
         s.add("org.apache.tomcat.dbcp.dbcp2.datasources.PerUserPoolDataSource");
         s.add("org.apache.tomcat.dbcp.dbcp2.datasources.SharedPoolDataSource");
 
+        // [databind#2999]: org.glassfish.web/javax.servlet.jsp.jstl (embedded Xalan)
+        // (derivative of #2469)
+        s.add("com.oracle.wls.shaded.org.apache.xalan.lib.sql.JNDIConnectionPool");
+
         DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,10 @@ public class SubTypeValidator`
`226`	`226`	`s.add("org.apache.tomcat.dbcp.dbcp2.datasources.PerUserPoolDataSource");`
`227`	`227`	`s.add("org.apache.tomcat.dbcp.dbcp2.datasources.SharedPoolDataSource");`
`228`	`228`
	`229`	`+ // [databind#2999]: org.glassfish.web/javax.servlet.jsp.jstl (embedded Xalan)`
	`230`	`+ // (derivative of #2469)`
	`231`	`+ s.add("com.oracle.wls.shaded.org.apache.xalan.lib.sql.JNDIConnectionPool");`
	`232`	`+`
`229`	`233`	`DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);`
`230`	`234`	`}`
`231`	`235`