From bfef95f9d0cd80a68fcd7a6f59b18080161ca326 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Tue, 11 Sep 2018 11:47:59 -0700 Subject: Correct fasterxml errors Different versions of fasterxml were being used at once, causing type errors. Change-Id: I42c28e26386284010fe5c965456e2c72fdb30f3c Signed-off-by: Patrick Brady Issue-ID: APPC-1202 --- appc-inbound/appc-design-services/provider/pom.xml | 10 ++++++++-- .../java/org/onap/appc/design/validator/ValidatorService.java | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'appc-inbound/appc-design-services') 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 @@ org.onap.appc.design.services org.onap.appc.instar,*;resolution:=optional - jackson-dataformat-yaml * true @@ -141,12 +140,19 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml - 2.3.2 com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.core + jackson-core + + + org.yaml + snakeyaml + org.apache.commons commons-lang3 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; -- cgit 1.2.3-korg