From: mark.j.leonard <mark.j.leonard@gmail.com>
Date: Wed, 7 Nov 2018 11:36:42 +0000 (+0000)
Subject: Upgrade Babel to sdc-tosca 1.4.6
X-Git-Tag: 1.4.1~60
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fbabel.git;a=commitdiff_plain;h=a0bd44713526d50f305116ad7751e9087952d421

Upgrade Babel to sdc-tosca 1.4.6

Change-Id: I53863aabd02050606605f2e905186b01232a77c9
Issue-ID: AAI-1771
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
---

diff --git a/pom.xml b/pom.xml
index 97e2afd..0da93c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
 
 		<!-- Dependency Versions -->
 		<common.logging.version>1.2.2</common.logging.version>
-		<sdc.tosca.version>1.4.4</sdc.tosca.version>
+		<sdc.tosca.version>1.4.6</sdc.tosca.version>
 		<commons.compress.version>1.18</commons.compress.version>
 		<javax.ws.rs.version>2.1</javax.ws.rs.version>
 		<mvn.jaxb2.version>0.13.2</mvn.jaxb2.version>
diff --git a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java
index ea312c2..97d69f8 100644
--- a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java
+++ b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java
@@ -31,6 +31,7 @@ import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.time.StopWatch;
 import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -39,9 +40,9 @@ import org.onap.aai.babel.logging.ApplicationMsgs;
 import org.onap.aai.babel.logging.LogHelper;
 import org.onap.aai.babel.service.data.BabelArtifact;
 import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.enums.SdcTypes;
 import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
 import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
-import org.onap.sdc.tosca.parser.impl.SdcTypes;
 import org.onap.sdc.toscaparser.api.NodeTemplate;
 import org.onap.sdc.toscaparser.api.SubstitutionMappings;