diff options
author | 2018-11-07 11:36:42 +0000 | |
---|---|---|
committer | 2018-11-07 11:39:18 +0000 | |
commit | a0bd44713526d50f305116ad7751e9087952d421 (patch) | |
tree | d2dc9b3857037b11a42a6b499d08a78499e0d8ab | |
parent | c3d7c9a953af53954b5b791869d8585d31c8eba2 (diff) |
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>
-rw-r--r-- | pom.xml | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -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; |