Remove forbidden dependencies

Upgrade org.codehaus.jackson : jackson-mapper-asl : 1.9.13 to com.fasterxml.jackson.core : jackson-databind : 2.8.7

Change Jackson error message in test to new error message.

Change-Id: I719166bcf71d171c2e2ba721790eb87fcda8f305
Issue-ID: SO-537
Signed-off-by: Arthur Martella <amartell@research.att.com>

diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml
index 110c4da..93b6c8f 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/pom.xml
+++ b/mso-api-handlers/mso-api-handler-infra/pom.xml
@@ -94,9 +94,9 @@
                  <version>1.9.13</version>
                </dependency>
                <dependency>
-                 <groupId>org.codehaus.jackson</groupId>
-                 <artifactId>jackson-mapper-asl</artifactId>
-                 <version>1.9.13</version>
+                 <groupId>com.fasterxml.jackson.core</groupId>
+                 <artifactId>jackson-databind</artifactId>
+                 <version>2.8.7</version>
                </dependency>
 
                <dependency>

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
index 6d6227a..2e0b53d 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
@@ -40,7 +40,7 @@ import javax.ws.rs.core.Response;
 \r
 import org.apache.http.HttpResponse;\r
 import org.apache.http.HttpStatus;\r
-import org.codehaus.jackson.map.ObjectMapper;\r
+import com.fasterxml.jackson.databind.ObjectMapper;\r
 import org.hibernate.Session;\r
 import org.json.JSONObject;\r
 import org.openecomp.mso.apihandler.common.ErrorNumbers;\r

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/CompareModelsRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/CompareModelsRequest.java
index 204dd3e..2c61d6e 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/CompareModelsRequest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/CompareModelsRequest.java
@@ -20,7 +20,7 @@
 
 package org.openecomp.mso.apihandlerinfra.e2eserviceinstancebeans;
 
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_DEFAULT)
 public class CompareModelsRequest {

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/DelE2ESvcResp.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/DelE2ESvcResp.java
index c05b097..a88e8f5 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/DelE2ESvcResp.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/DelE2ESvcResp.java
@@ -20,7 +20,7 @@
 
 package org.openecomp.mso.apihandlerinfra.e2eserviceinstancebeans;
 
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_DEFAULT)
 public class DelE2ESvcResp {

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/E2ERequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/E2ERequest.java
index e7ff2f6..5b48cbe 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/E2ERequest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/E2ERequest.java
@@ -23,7 +23,7 @@ package org.openecomp.mso.apihandlerinfra.e2eserviceinstancebeans;
 \r
 import java.sql.Timestamp;\r
 \r
-import org.codehaus.jackson.map.annotate.JsonSerialize;\r
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;\r
 \r
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_DEFAULT)\r
 public class E2ERequest {\r

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/GetE2EServiceInstanceResponse.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/GetE2EServiceInstanceResponse.java
index 0413723..18cdd99 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/GetE2EServiceInstanceResponse.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/GetE2EServiceInstanceResponse.java
@@ -21,7 +21,7 @@
 \r
 package org.openecomp.mso.apihandlerinfra.e2eserviceinstancebeans;\r
 \r
-import org.codehaus.jackson.map.annotate.JsonSerialize;\r
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;\r
 import org.openecomp.mso.requestsdb.OperationStatus;\r
 \r
 @JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT)\r

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java
index 4920814..590ac7c 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java
@@ -670,7 +670,7 @@ public class E2EServiceInstancesTest {
                Response resp = instance.createE2EServiceInstance(request, "v3");\r
                String respStr = resp.getEntity().toString();\r
                assertTrue(respStr\r
-            .contains("Mapping of request to JSON object failed.  No content to map to Object due to end of input"));\r
+            .contains("Mapping of request to JSON object failed.  No content to map due to end-of-input"));\r
        }\r
 \r
        @Ignore // 1802 merge\r