Third Party Dependency Update - Jackson

Update test for fixed issue: FasterXML/jackson-databind#4464 391209
rogersteblerbsi · Dec 16, 2024 · baba9a7 · baba9a7
1 parent aead2a1
commit baba9a7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/...c/test/java/org/eclipse/scout/rt/jackson/dataobject/JsonDataObjectsSerializationTest.java b/...c/test/java/org/eclipse/scout/rt/jackson/dataobject/JsonDataObjectsSerializationTest.java
@@ -644,7 +644,7 @@ public void testSerializeDeserialize_ROOT_Locale() throws Exception {
       String serializedDefaultJackson = s_defaultJacksonObjectMapper.writeValueAsString(pojo);
       TestPojoWithLocaleProperties deserializedDefaultJackson = s_defaultJacksonObjectMapper.readValue(serializedDefaultJackson, TestPojoWithLocaleProperties.class);
       assertJsonEquals("TestSerializeDeserialize_ROOT_Locale_defaultJackson.json", serializedDefaultJackson);
-      assertThat(deserializedDefaultJackson.getLocale1(), is(Locale.ROOT));
+      assertNull(deserializedDefaultJackson.getLocale1()); // Include.NO_DEFAULT removes empty properties
       assertThat(deserializedDefaultJackson.getLocale2(), is(Locale.forLanguageTag("de-CH")));
       assertThat(deserializedDefaultJackson.getLocaleStringMap(), is(localeMap));
 

diff --git a/...ipse/scout/rt/jackson/dataobject/TestSerializeDeserialize_ROOT_Locale_defaultJackson.json b/...ipse/scout/rt/jackson/dataobject/TestSerializeDeserialize_ROOT_Locale_defaultJackson.json
@@ -1,6 +1,5 @@
 {
   "_type" : "pojo-with-locale-property",
-  "locale1" : "",
   "locale2" : "de_CH",
   "localeStringMap" : {
     "" : "Root",

diff --git a/org.eclipse.scout.rt/pom.xml b/org.eclipse.scout.rt/pom.xml
@@ -126,7 +126,7 @@
     <jetty.version>12.0.15</jetty.version>
     <slf4j.version>2.0.9</slf4j.version>
     <logback.version>1.4.14</logback.version>
-    <jackson.version>2.16.0</jackson.version>
+    <jackson.version>2.18.2</jackson.version>
     <io.netty-version>4.1.114.Final</io.netty-version>
     <apache.tika-version>3.0.0</apache.tika-version>
     <batik.version>1.18</batik.version>