From 9f4e97019fb0dd836533d0b6198c88787e235ae2 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Sat, 29 Feb 2020 17:35:12 -0800 Subject: [PATCH] Fixing issues #2631 and #2634 --- .../jackson/databind/jsontype/impl/SubTypeValidator.java | 7 +++++++ 1 files changed, 7 insertions(+) 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 64c6c764f..bf04f1bde 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 @@ -128,6 +128,13 @@ public class SubTypeValidator // [databind#2620]: xbean-reflect s.add("org.apache.xbean.propertyeditor.JndiConverter"); + // [databind#2631]: shaded hikari-config + s.add("org.apache.hadoop.shaded.com.zaxxer.hikari.HikariConfig"); + + // [databind#2634]: ibatis-sqlmap, anteros-core + s.add("com.ibatis.sqlmap.engine.transaction.jta.JtaTransactionConfig"); + s.add("br.com.anteros.dbcp.AnterosDBCPConfig"); + DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s); }