diff options
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-04-07 09:36:01 -0700 |
|---|---|---|
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-04-07 09:36:01 -0700 |
| commit | 3614d6c6e6c0f2843693a4a5dbc9176e31cbdd82 (patch) | |
| tree | 5863c84423f5028dfad948f4f5a71209bed6552b /src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java | |
| parent | 96cfd9e22c693b9e1c965f0b64b5f3cde06495e2 (diff) | |
| parent | 77040d85e3eb6710508e6445640ae1a3d5e60c22 (diff) | |
| download | jackson-databind-3614d6c6e6c0f2843693a4a5dbc9176e31cbdd82.tar.gz | |
Merge branch '2.9' into 2.10
Diffstat (limited to 'src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java')
| -rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java | 3 |
1 files changed, 3 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 48f0605e7..bb77ed47e 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 @@ -177,6 +177,9 @@ public class SubTypeValidator // [databind#2666]: apache/commons-jms s.add("org.apache.commons.proxy.provider.remoting.RmiProvider"); + // [databind#2682]: commons-jelly + s.add("org.apache.commons.jelly.impl.Embedded"); + DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s); } |