From aedc8c0e762bb7f1a1db3e241f197bdb034eb56e Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Thu, 24 Jan 2019 17:35:39 -0500 Subject: Upgraded tosca parser to version 1.4.8 - Upgraded tosca parser to version 1.4.8 and updated imports Change-Id: Ic9549375d3d70598606056691e4e8baabfbd83d1 Issue-ID: SO-1426 Signed-off-by: Benjamin, Max (mb388a) --- asdc-controller/pom.xml | 4 ++-- .../java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java | 2 +- .../src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index 2a20b96048..50fbdd447b 100644 --- a/asdc-controller/pom.xml +++ b/asdc-controller/pom.xml @@ -192,12 +192,12 @@ org.onap.sdc.sdc-tosca sdc-tosca - 1.4.4 + 1.4.8 org.onap.sdc.jtosca jtosca - 1.4.4 + 1.4.8 org.onap.so diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java index 722e1599b6..e455d2da93 100644 --- a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java +++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java @@ -35,8 +35,8 @@ import org.hibernate.exception.LockAcquisitionException; import org.onap.sdc.api.notification.IArtifactInfo; import org.onap.sdc.api.notification.IResourceInstance; import org.onap.sdc.api.notification.IStatusData; +import org.onap.sdc.tosca.parser.enums.SdcTypes; import org.onap.sdc.tosca.parser.impl.SdcPropertyNames; -import org.onap.sdc.tosca.parser.impl.SdcTypes; import org.onap.sdc.toscaparser.api.CapabilityAssignment; import org.onap.sdc.toscaparser.api.CapabilityAssignments; import org.onap.sdc.toscaparser.api.Group; diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java b/asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java index f7c761f017..24304ba28c 100644 --- a/asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java +++ b/asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java @@ -28,8 +28,8 @@ import org.onap.sdc.api.notification.IArtifactInfo; import org.onap.sdc.api.notification.INotificationData; import org.onap.sdc.api.notification.IResourceInstance; import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.tosca.parser.enums.SdcTypes; import org.onap.sdc.tosca.parser.impl.SdcPropertyNames; -import org.onap.sdc.tosca.parser.impl.SdcTypes; import org.onap.sdc.toscaparser.api.Group; import org.onap.sdc.toscaparser.api.NodeTemplate; import org.onap.sdc.toscaparser.api.elements.Metadata; -- cgit 1.2.3-korg