Upgrade Vulnerable Direct Dependencies [jackson] 67/110367/8
authoramohamad <a.mohamad@queensu.ca>
Mon, 20 Jul 2020 02:17:57 +0000 (22:17 -0400)
committerSébastien Determe <sebastien.determe@intl.att.com>
Fri, 4 Sep 2020 13:21:08 +0000 (13:21 +0000)
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>
22 files changed:
catalog-be/pom.xml
catalog-be/src/main/java/org/openecomp/sdc/be/impl/ComponentsUtils.java
onboarding/pom.xml
openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml
openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/src/main/webapp/WEB-INF/beans-services.xml
openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml
openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/java/org/openecomp/server/interceptors/InternalEmptyObject.java
openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/beans-services.xml
openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/DefaultExceptionMapper.java
openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/errors/DefaultExceptionMapperTest.java
openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolRequestDto.java
openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml
openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/main/java/org/openecomp/sdc/itempermissions/servlet/PermissionsFilter.java
openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml
openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/pom.xml
openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-worker/src/main/java/org/openecomp/sdc/notification/workers/impl/NewNotificationsReaderRestImpl.java
openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java
openecomp-be/tools/zusammen-tools/src/main/java/org/openecomp/core/tools/exportinfo/ExportSerializer.java
openecomp-be/tools/zusammen-tools/src/main/java/org/openecomp/core/tools/importinfo/ImportSingleTable.java
pom.xml
test-apis-ci/pom.xml
ui-ci/pom.xml

index 4eb05e6..4959e22 100644 (file)
       <artifactId>commons-collections4</artifactId>
       <version>${commons.collections.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>${jackson.mapper.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.onap.sdc.sdc-be-common</groupId>
       <artifactId>security-util-lib</artifactId>
index c94f0d7..d3a8644 100644 (file)
@@ -1765,7 +1765,7 @@ public class ComponentsUtils {
             return Collections.emptyList();
         }
 
-        return uiConstraintsMaps.stream().map(dataMap -> new org.codehaus.jackson.map.ObjectMapper()
+        return uiConstraintsMaps.stream().map(dataMap -> new com.fasterxml.jackson.databind.ObjectMapper()
             .convertValue(dataMap, UIConstraint.class)).collect(Collectors.toList());
     }
 
index 2d7927e..7539165 100644 (file)
@@ -98,7 +98,7 @@
     <jersey.core.version>1.19.1</jersey.core.version>
     <jersey.multipart.version>1.18.1</jersey.multipart.version>
     <logback.version>1.2.3</logback.version>
-    <org.codehaus.jackson.version>1.9.13</org.codehaus.jackson.version>
+    <mockito.all.version>1.10.19</mockito.all.version>
     <org.everit.json.schema.version>1.5.1</org.everit.json.schema.version>
     <org.reflections.version>0.9.10</org.reflections.version>
     <servlet.version>2.5</servlet.version>
index 6a6dd0a..d6b80e5 100644 (file)
         </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>
index 6ecc8cc..33fa297 100644 (file)
     <!-- 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>
 
index ba2bea1..9ead2b4 100644 (file)
         </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>
index f2811e7..62ae816 100644 (file)
     <!-- 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>
 
index 618ac59..9fe70fc 100644 (file)
@@ -29,7 +29,7 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 
 import org.apache.commons.collections4.CollectionUtils;
-import org.codehaus.jackson.map.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import org.hibernate.validator.internal.engine.path.PathImpl;
 import org.openecomp.core.utilities.file.FileUtils;
 import org.openecomp.core.utilities.json.JsonUtil;
index 8634cd3..680c340 100644 (file)
@@ -26,7 +26,7 @@ import java.util.Set;
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import javax.ws.rs.core.Response;
-import org.codehaus.jackson.map.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import org.hibernate.validator.internal.engine.path.PathImpl;
 import org.junit.Test;
 import org.junit.runner.RunWith;
index f9a0456..642156f 100644 (file)
@@ -22,7 +22,7 @@ package org.openecomp.sdcrests.vendorlicense.types;
 
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.hibernate.validator.constraints.NotBlank;
 import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolType;
 import org.openecomp.sdc.vendorlicense.dao.types.OperationalScope;
index 68a403d..cf6e180 100644 (file)
@@ -79,9 +79,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>${jackson.mapper.version}</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>org.everit.json</groupId>
index 9fe045f..1edfad3 100644 (file)
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.HttpMethod;
 import javax.ws.rs.core.Response;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.openecomp.sdc.common.errors.ErrorCode;
 import org.openecomp.sdc.common.errors.ErrorCodeAndMessage;
 import org.openecomp.sdc.common.errors.Messages;
index dc2c568..e5eebc9 100644 (file)
@@ -34,9 +34,9 @@
             <version>${commons.collections.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>${jackson.mapper.version}</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
index 4bbe0f6..000b423 100644 (file)
       <version>${project.version}</version>
     </dependency>
     <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>org.springframework</groupId>
index a332efa..86a3030 100644 (file)
@@ -24,7 +24,7 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.openecomp.sdc.logging.api.Logger;
 import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.openecomp.sdc.notification.config.ConfigurationManager;
index 0ca5e64..703fa0d 100644 (file)
@@ -41,7 +41,7 @@ import java.util.zip.ZipInputStream;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.tuple.Pair;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.onap.sdc.tosca.datatypes.model.GroupDefinition;
 import org.onap.sdc.tosca.datatypes.model.NodeTemplate;
index 1a7e6e9..b41f74f 100644 (file)
@@ -35,7 +35,7 @@ import java.nio.file.Paths;
 import java.util.*;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.openecomp.core.tools.importinfo.ImportProperties;
 import org.openecomp.core.tools.model.ColumnDefinition;
 import org.openecomp.core.tools.model.TableData;
index 7516b36..40486c8 100644 (file)
@@ -30,7 +30,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
 import com.google.common.collect.Sets;
 import org.apache.commons.lang3.StringUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.openecomp.core.nosqldb.impl.cassandra.CassandraSessionFactory;
 import org.openecomp.core.tools.exportinfo.ExportDataCommand;
 import org.openecomp.core.tools.model.ColumnDefinition;
diff --git a/pom.xml b/pom.xml
index 0eaa8b5..df4da63 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -66,12 +66,12 @@ Modifications copyright (c) 2018-2019 Nokia
 
         <jetty.version>9.4.18.v20190429</jetty.version>
 
-        <!-- JSON and YAML Parsing -->
-        <jackson.version>2.10.0</jackson.version>
-        <jackson-annotations.version>${jackson.version}</jackson-annotations.version>
-        <jackson.mapper.version>1.9.13</jackson.mapper.version>
-        <clearspring.version>2.1.1</clearspring.version>
-        <skipYamlJsonValidator>false</skipYamlJsonValidator>
+    <!-- JSON and YAML Parsing -->
+    <jackson.version>2.11.0</jackson.version>
+    <jackson-annotations.version>${jackson.version}</jackson-annotations.version>
+
+    <clearspring.version>2.1.1</clearspring.version>
+    <skipYamlJsonValidator>false</skipYamlJsonValidator>
 
         <!-- Yaml for properties -->
         <snakeyaml.version>1.14</snakeyaml.version>
@@ -156,12 +156,16 @@ Modifications copyright (c) 2018-2019 Nokia
         <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
         <!--togglz version-->
         <togglz.version>2.4.1.Final</togglz.version>
+
         <joda.time.version>2.9.9</joda.time.version>
+
         <!--sdc-security-utils-->
         <security.util.lib.version>1.6.0</security.util.lib.version>
         <!--jacoco-->
         <jacoco.version>0.8.5</jacoco.version>
         <java.driver.core.version>4.5.1</java.driver.core.version>
+
+        <!-- Surefire parameters  -->
         <surefire.forkCount>1C</surefire.forkCount>
         <surefire.reuseForks>true</surefire.reuseForks>
     </properties>
@@ -675,7 +679,6 @@ Modifications copyright (c) 2018-2019 Nokia
                 <module>integration-tests</module>
             </modules>
         </profile>
-
     </profiles>
 
     <repositories>
index 2ae8752..0037c41 100644 (file)
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>1.9.2</version>
-      <scope>compile</scope>
-    </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
index 54933dc..244f997 100644 (file)
       <scope>compile</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>1.9.2</version>
-      <scope>compile</scope>
-    </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>