[olingo-odata4] branch master updated: [OLINGO-1546]Support Jackson 2.12.x

[ramyav]

This is an automated email from the ASF dual-hosted git repository.

ramyav pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git


The following commit(s) were added to refs/heads/master by this push:
     new 911d9d8  [OLINGO-1546]Support Jackson 2.12.x
911d9d8 is described below

commit 911d9d8e7f600145d04ab735a50210bb00b32501
Author: ramya vasanth <ramya.vasa...@sap.com>
AuthorDate: Fri Sep 17 11:27:16 2021 +0530

    [OLINGO-1546]Support Jackson 2.12.x
---
 .../client/core/serialization/ClientODataDeserializerImpl.java    | 4 +++-
 pom.xml                                                           | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java
 
b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java
index a7c0e94..4e558a5 100644
--- 
a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java
+++ 
b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java
@@ -66,6 +66,7 @@ import 
com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
 import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
 import com.fasterxml.jackson.dataformat.xml.XmlFactory;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser;
 
 public class ClientODataDeserializerImpl implements ClientODataDeserializer {
 
@@ -110,7 +111,8 @@ public class ClientODataDeserializerImpl implements 
ClientODataDeserializer {
         new XmlFactory(new InputFactoryImpl(), new OutputFactoryImpl()), new 
JacksonXmlModule());
 
     xmlMapper.setInjectableValues(new 
InjectableValues.Std().addValue(Boolean.class, Boolean.FALSE));
-
+    xmlMapper.enable(FromXmlParser.Feature.EMPTY_ELEMENT_AS_NULL);
+    
     xmlMapper.addHandler(new DeserializationProblemHandler() {
       @Override
       public boolean handleUnknownProperty(final DeserializationContext ctxt, 
final JsonParser jp,
diff --git a/pom.xml b/pom.xml
index e7a6f34..8e423c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,17 +82,17 @@
     <servlet.version>3.1.0</servlet.version>
     <cxf.version>3.0.0</cxf.version>
     <spring.version>4.0.6.RELEASE</spring.version>
-    <netty.version>4.1.58.Final</netty.version>
+    <netty.version>4.1.66.Final</netty.version>
 
     <velocity.version>1.7</velocity.version>
     <maven.plugin.api.version>3.2.2</maven.plugin.api.version>
     <maven.plugin.tools.version>3.3</maven.plugin.tools.version>
     <maven.bundle.plugin.version>2.5.3</maven.bundle.plugin.version>
     <maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
-    <hc.client.version>4.5.8</hc.client.version>
+    <hc.client.version>4.5.13</hc.client.version>
     <hc.core.version>4.4.11</hc.core.version>
-    <jackson.version>2.11.3</jackson.version>
-    <jackson-databind.version>2.11.4</jackson-databind.version>
+    <jackson.version>2.12.4</jackson.version>
+    <jackson-databind.version>2.12.4</jackson-databind.version>
     <aalto-xml.version>0.9.11</aalto-xml.version>
 
     <android.platform.version>4.1.1.4</android.platform.version>