aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatu Saloranta <tatu.saloranta@iki.fi>2020-08-02 11:41:38 -0700
committerTatu Saloranta <tatu.saloranta@iki.fi>2020-08-02 11:41:38 -0700
commit04c83a039c5dcbafe345086b7d268a0227c90e85 (patch)
tree4b09e75f9985d2cbecb9ff2d3fc27f4ae2a33d20
parent8bdbfb90ebd7644161841c6733f12bbbdfcea27e (diff)
parent24bfc4cc85e7b83e8f39db91fc0a745d7ab7a233 (diff)
downloadjackson-databind-04c83a039c5dcbafe345086b7d268a0227c90e85.tar.gz
Merge branch '2.11' into 2.12
-rw-r--r--release-notes/VERSION-2.x2
-rw-r--r--src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java7
2 files changed, 7 insertions, 2 deletions
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index 3a32e87ff..659dbbcab 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -57,7 +57,7 @@ Project: jackson-databind
- Add `BeanDeserializerBase.isCaseInsensitive()`
- Some refactoring of `CollectionDeserializer` to solve CSV array handling issues
-2.11.2 (not yet released)
+2.11.2 (02-Aug-2020)
#2783: Parser/Generator features not set when using `ObjectMapper.createParser()`,
`createGenerator()`
diff --git a/src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java b/src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java
index 34b50878b..ca59b5d7c 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java
+++ b/src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java
@@ -18,8 +18,8 @@ public class JsonIgnoreProperties2803Test extends BaseMapTest
}
static class Room2803 {
- public String id;
public Building2803 something;
+ public String id;
}
private final ObjectMapper MAPPER = newJsonMapper();
@@ -31,6 +31,11 @@ public class JsonIgnoreProperties2803Test extends BaseMapTest
// Important! Must do both calls, in this order
Museum2803 museum = MAPPER.readValue(DOC, Museum2803.class);
+ assertNotNull(museum);
+//System.err.println();
+//System.err.println("------------------------------");
+//System.err.println();
Building2803 building = MAPPER.readValue(DOC, Building2803.class);
+ assertNotNull(building);
}
}