From: Patrick Brady <pb071s@att.com>
Date: Tue, 11 Sep 2018 18:47:59 +0000 (-0700)
Subject: Correct fasterxml errors
X-Git-Tag: 1.4.0~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bfef95f9d0cd80a68fcd7a6f59b18080161ca326;p=appc.git

Correct fasterxml errors

Different versions of fasterxml were being used at once,
causing type errors.

Change-Id: I42c28e26386284010fe5c965456e2c72fdb30f3c
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-1202
---

diff --git a/appc-inbound/appc-design-services/provider/pom.xml b/appc-inbound/appc-design-services/provider/pom.xml
index 7197c0633..f4ffee6fb 100755
--- a/appc-inbound/appc-design-services/provider/pom.xml
+++ b/appc-inbound/appc-design-services/provider/pom.xml
@@ -43,7 +43,6 @@
                     <instructions>
                         <Export-Package>org.onap.appc.design.services</Export-Package>
                         <Import-Package>org.onap.appc.instar,*;resolution:=optional</Import-Package>
-                        <Embed-Dependency>jackson-dataformat-yaml</Embed-Dependency>
                          <DynamicImport-Package>*</DynamicImport-Package>
                         <Embed-Transitive>true</Embed-Transitive>
                     </instructions>
@@ -141,12 +140,19 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.3.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/validator/ValidatorService.java b/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/validator/ValidatorService.java
index 9f1715e60..34df83dc8 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/validator/ValidatorService.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/validator/ValidatorService.java
@@ -25,8 +25,8 @@ package org.onap.appc.design.validator;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.snakeyaml.Yaml;
-import com.fasterxml.jackson.dataformat.yaml.snakeyaml.introspector.BeanAccess;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.introspector.BeanAccess;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;