Skip to content

Commit fd54bef

Browse files
committed
Preparing for 2.3.1 release
1 parent 69b8487 commit fd54bef

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.fasterxml</groupId>
77
<artifactId>oss-parent</artifactId>
8-
<version>11</version>
8+
<version>12</version>
99
</parent>
1010

1111
<groupId>com.fasterxml.jackson.core</groupId>
@@ -74,7 +74,7 @@ javax.xml.datatype, javax.xml.namespace, javax.xml.parsers
7474
<dependency>
7575
<groupId>com.fasterxml.jackson.core</groupId>
7676
<artifactId>jackson-core</artifactId>
77-
<version>2.3.1-SNAPSHOT</version>
77+
<version>2.3.1</version>
7878
</dependency>
7979

8080
<!-- and for testing, JUnit is needed, as well as quite a few

release-notes/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Project: jackson-databind
2-
Version: 2.3.1 (xx-Dec-2013)
2+
Version: 2.3.1 (28-Dec-2013)
33

44
#346: Fix problem deserializing `ObjectNode`, with @JsonCreator, empty
55
JSON Object

src/main/java/com/fasterxml/jackson/databind/JsonSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public JsonSerializer<T> unwrappingSerializer(NameTransformer unwrapper) {
8585
public JsonSerializer<T> replaceDelegatee(JsonSerializer<?> delegatee) {
8686
throw new UnsupportedOperationException();
8787
}
88-
88+
8989
/*
9090
/**********************************************************
9191
/* Serialization methods

src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ protected void handleUnknownProperty(JsonParser jp, DeserializationContext ctxt,
752752
throws IOException, JsonProcessingException
753753
{
754754
if (instanceOrClass == null) {
755-
instanceOrClass = getValueClass();
755+
instanceOrClass = handledType();
756756
}
757757
// Maybe we have configured handler(s) to take care of it?
758758
if (ctxt.handleUnknownProperty(jp, this, instanceOrClass, propName)) {

src/test/java/com/fasterxml/jackson/failing/TestObjectId154.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ public void testObjectAndTypeId() throws Exception
2222
{
2323
final ObjectMapper mapper = new ObjectMapper();
2424

25-
Foo foo = new Foo();
2625
Bar bar = new Bar();
27-
foo.ref = bar;
26+
Foo foo = new Foo();
2827
bar.next = foo;
28+
foo.ref = bar;
2929

3030
String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(bar);
3131

0 commit comments

Comments
 (0)