24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
From 7dbf51bf78d157098074a20bd9da39bd48c18e4a Mon Sep 17 00:00:00 2001
|
|
From: Tatu Saloranta <tatu.saloranta@iki.fi>
|
|
Date: Thu, 17 Sep 2020 20:11:25 -0700
|
|
Subject: [PATCH] Fix #2854
|
|
|
|
---
|
|
.../jackson/databind/jsontype/impl/SubTypeValidator.java | 3 ++-
|
|
|
|
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 dc706429cf..a8b5cb1ba3 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
|
|
@@ -143,8 +143,9 @@
|
|
// [databind#2814]: anteros-dbcp
|
|
s.add("br.com.anteros.dbcp.AnterosDBCPDataSource");
|
|
|
|
- // [databind#2642]: javax.swing (jdk)
|
|
+ // [databind#2642][databind#2854]: javax.swing (jdk)
|
|
s.add("javax.swing.JEditorPane");
|
|
+ s.add("javax.swing.JTextPane");
|
|
|
|
// [databind#2648], [databind#2653]: shire-core
|
|
s.add("org.apache.shiro.realm.jndi.JndiRealmFactory");
|