diff options
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-03-28 12:53:09 -0700 |
|---|---|---|
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-03-28 12:53:09 -0700 |
| commit | 9b8c0ea80fddfd4fdcd74968ec5e4e71ebf64f8c (patch) | |
| tree | 88b18bf69980975292d4e037fe5e984a5bba08e6 /src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java | |
| parent | 5d2d7e58fd5ef73eebabbb34ef267ef1d3bd4915 (diff) | |
| parent | e2ba12d5d60715d95105e3e790fc234cfb59893d (diff) | |
| download | jackson-databind-9b8c0ea80fddfd4fdcd74968ec5e4e71ebf64f8c.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, 2 insertions, 1 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 d662954bf..abe0c2b17 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 @@ -74,10 +74,11 @@ public class SubTypeValidator s.add("com.sun.deploy.security.ruleset.DRSHelper"); s.add("org.apache.axis2.jaxws.spi.handler.HandlerResolverImpl"); - // [databind#2186]: yet more 3rd party gadgets + // [databind#2186], [databind#2670]: yet more 3rd party gadgets s.add("org.jboss.util.propertyeditor.DocumentEditor"); s.add("org.apache.openjpa.ee.RegistryManagedRuntime"); s.add("org.apache.openjpa.ee.JNDIManagedRuntime"); + s.add("org.apache.openjpa.ee.WASRegistryManagedRuntime"); // [#2670] addition s.add("org.apache.axis2.transport.jms.JMSOutTransportInfo"); // [databind#2326] (2.9.9) |