Skip to content

Commit d9bd5fe

Browse files
Third Party Dependency Update - Jackson
Update test for fixed issue: FasterXML/jackson-databind#4464 391209
1 parent 47d5523 commit d9bd5fe

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

org.eclipse.scout.rt.jackson.test/src/test/java/org/eclipse/scout/rt/jackson/dataobject/JsonDataObjectsSerializationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ public void testSerializeDeserialize_ROOT_Locale() throws Exception {
644644
String serializedDefaultJackson = s_defaultJacksonObjectMapper.writeValueAsString(pojo);
645645
TestPojoWithLocaleProperties deserializedDefaultJackson = s_defaultJacksonObjectMapper.readValue(serializedDefaultJackson, TestPojoWithLocaleProperties.class);
646646
assertJsonEquals("TestSerializeDeserialize_ROOT_Locale_defaultJackson.json", serializedDefaultJackson);
647-
assertThat(deserializedDefaultJackson.getLocale1(), is(Locale.ROOT));
647+
assertNull(deserializedDefaultJackson.getLocale1()); // Include.NO_DEFAULT removes empty properties
648648
assertThat(deserializedDefaultJackson.getLocale2(), is(Locale.forLanguageTag("de-CH")));
649649
assertThat(deserializedDefaultJackson.getLocaleStringMap(), is(localeMap));
650650

org.eclipse.scout.rt.jackson.test/src/test/resources/org/eclipse/scout/rt/jackson/dataobject/TestSerializeDeserialize_ROOT_Locale_defaultJackson.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"_type" : "pojo-with-locale-property",
3-
"locale1" : "",
43
"locale2" : "de_CH",
54
"localeStringMap" : {
65
"" : "Root",

org.eclipse.scout.rt/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<jetty.version>12.0.15</jetty.version>
127127
<slf4j.version>2.0.9</slf4j.version>
128128
<logback.version>1.4.14</logback.version>
129-
<jackson.version>2.16.0</jackson.version>
129+
<jackson.version>2.18.2</jackson.version>
130130
<io.netty-version>4.1.114.Final</io.netty-version>
131131
<apache.tika-version>3.0.0</apache.tika-version>
132132
<batik.version>1.18</batik.version>

0 commit comments

Comments
 (0)