From c16117e08b97da93da61be841c22f5759cdadd37 Mon Sep 17 00:00:00 2001
From: amohamad <a.mohamad@queensu.ca>
Date: Sun, 19 Jul 2020 22:17:57 -0400
Subject: Upgrade Vulnerable Direct Dependencies [jackson]

Issue-ID: SDC-3051

Upgrade from jackson-databind 1.9 and 2.10 to 2.11

upgrade the respective pom.xml files

Upgrade the 1.9 imports and required code changes

Upgrade the beans-services.xml files

Change-Id: I56b59e08d65a0a1888c8caeb5470bc0c6a028ddd
Signed-off-by: amohamad <a.mohamad@queensu.ca>
---
 .../api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml   | 12 ++++++------
 .../src/main/webapp/WEB-INF/beans-services.xml               |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe')

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml
index 6a6dd0aa73..d6b80e5430 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml
@@ -33,14 +33,14 @@
         </dependency>
         <!-- JSON -->
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-jaxrs</artifactId>
-            <version>${org.codehaus.jackson.version}</version>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-core-asl</artifactId>
-            <version>${org.codehaus.jackson.version}</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/src/main/webapp/WEB-INF/beans-services.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/src/main/webapp/WEB-INF/beans-services.xml
index 6ecc8cc7e3..33fa2970ed 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/src/main/webapp/WEB-INF/beans-services.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/src/main/webapp/WEB-INF/beans-services.xml
@@ -16,11 +16,11 @@
     <!-- Needed for JSR-303 validations. May be removed when moving to JAX-RS 2.0 -->
     <bean class="org.springframework.validation.beanvalidation.MethodValidationPostProcessor"/>
 
-    <bean id="jacksonObjectMapper" class="org.codehaus.jackson.map.ObjectMapper">
+    <bean id="jacksonObjectMapper" class="com.fasterxml.jackson.databind.ObjectMapper">
         <property name="serializationInclusion" value="NON_NULL"/>
     </bean>
 
-    <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJsonProvider">
+    <bean id="jsonProvider" class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider">
         <property name="mapper" ref="jacksonObjectMapper"/>
     </bean>
 
-- 
cgit 1.2.3-korg