Merge "Check if InstanceGroup modelUUID already exists" into dublin

diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml
index 8317b66..60c517d 100644 (file)
--- a/asdc-controller/pom.xml
+++ b/asdc-controller/pom.xml
@@ -16,8 +16,8 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <antlr.version>4.7.1</antlr.version>
     <java.version>1.8</java.version>
-    <sdc.tosca.version>1.5.0</sdc.tosca.version>
-    <jtosca.version>1.5.0</jtosca.version>
+    <sdc.tosca.version>1.5.1</sdc.tosca.version>
+    <jtosca.version>1.5.1</jtosca.version>
   </properties>
 
   <build>

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index 891a57d..20be69c 100644 (file)
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -363,16 +363,6 @@
       <groupId>org.glassfish.jersey.media</groupId>
       <artifactId>jersey-media-json-jackson</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.onap.sdc.sdc-tosca</groupId>
-      <artifactId>sdc-tosca</artifactId>
-      <version>1.4.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.sdc.jtosca</groupId>
-      <artifactId>jtosca</artifactId>
-      <version>1.4.4</version>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>

diff --git a/docs/architecture/SO Internal Arc.pptx b/docs/architecture/SO Internal Arc.pptx
index bff3e35..ee4b112 100644 (file)
Binary files a/docs/architecture/SO Internal Arc.pptx and b/docs/architecture/SO Internal Arc.pptx differ