Merge "Update bpmn and groovy files for ccvpn usecase"

diff --git a/adapters/mso-adapter-utils/src/test/resources/__files/HeatStack.json b/adapters/mso-adapter-utils/src/test/resources/__files/HeatStack.json
index 411a3e0..679e8e1 100644 (file)
--- a/adapters/mso-adapter-utils/src/test/resources/__files/HeatStack.json
+++ b/adapters/mso-adapter-utils/src/test/resources/__files/HeatStack.json
@@ -1,11 +1,11 @@
 {
     "description" : "description",
     "links" : [],
-    "stackStatusReason" : "stackStatusReason",
-    "stackName" : "stackName",
-    "updatedTime" : null,
-    "creationTime" : null,
-    "stackStatus" : "stackStatus",
+    "stack_status_reason" : "stackStatusReason",
+    "stack_name" : "stackName",
+    "updated_time" : null,
+    "creation_time" : null,
+    "stack_status" : "stackStatus",
     "id" : "id",
     "files" : {}
 }
\ No newline at end of file

diff --git a/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Access.json b/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Access.json
index f1c08cc..cd516ad 100644 (file)
--- a/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Access.json
+++ b/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Access.json
@@ -18,7 +18,7 @@
                                                "adminURL": null
                                        }
                                ],
-                               "endpointsLinks": null
+                               "endpoints_links": null
                        },
                        {
                                "type": "network",
@@ -31,7 +31,7 @@
                                                "adminURL": null
                                        }
                                ],
-                               "endpointsLinks": null
+                               "endpoints_links": null
                        },
                        {
                                "type": "identity",
@@ -44,7 +44,7 @@
                                                "adminURL": null
                                        }
                                ],
-                               "endpointsLinks": null
+                               "endpoints_links": null
                        }
                ],
                "user": null,

diff --git a/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Stack_DeleteComplete.json b/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Stack_DeleteComplete.json
index 8612258..a26a551 100644 (file)
--- a/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Stack_DeleteComplete.json
+++ b/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Stack_DeleteComplete.json
@@ -2,10 +2,10 @@
        "stack": {
                "description": null,
                "links": null,
-               "stackStatusReason": null,
-               "stackName": null,
-               "updatedTime": null,
-               "creationTime": null,
+               "stack_status_reason": null,
+               "stack_name": null,
+               "updated_time": null,
+               "creation_time": null,
                "stack_status": "DELETE_COMPLETE",
                "id": "stackId",
                "files": null,

diff --git a/adapters/mso-adapter-utils/src/test/resources/__files/UpdateStack.json b/adapters/mso-adapter-utils/src/test/resources/__files/UpdateStack.json
index 0a09d59..bf61cc8 100644 (file)
--- a/adapters/mso-adapter-utils/src/test/resources/__files/UpdateStack.json
+++ b/adapters/mso-adapter-utils/src/test/resources/__files/UpdateStack.json
@@ -1,11 +1,11 @@
 {
     "description" : "description",
     "links" : [],
-    "stackStatusReason" : "stackStatusReason",
-    "stackName" : "stackName",
-    "updatedTime" : null,
-    "creationTime" : null,
-    "stackStatus" : "UPDATE_COMPLETE",
+    "stack_status_reason" : "stackStatusReason",
+    "stack_name" : "stackName",
+    "updated_time" : null,
+    "creation_time" : null,
+    "stack_status" : "UPDATE_COMPLETE",
     "id" : "id",
     "files" : {}
 }
\ No newline at end of file

diff --git a/adapters/mso-adapters-rest-interface/src/test/resources/stack-example.json b/adapters/mso-adapters-rest-interface/src/test/resources/stack-example.json
index c0f08f8..968f617 100644 (file)
--- a/adapters/mso-adapters-rest-interface/src/test/resources/stack-example.json
+++ b/adapters/mso-adapters-rest-interface/src/test/resources/stack-example.json
@@ -1,13 +1,12 @@
 {
        "outputs" : [{
-               "outputKey": "key1",
-               "outputValue": "value1"
+               "output_key": "key1",
+               "output_value": "value1"
        },{
-               "outputKey": "key2",
-               "outputValue": "value2"
+               "output_key": "key2",
+               "output_value": "value2"
        },{
-               "outputKey": "key3",
-               "outputValue": "value3"
+               "output_key": "key3",
+               "output_value": "value3"
        }]
-
 }
\ No newline at end of file

diff --git a/mso-api-handlers/mso-api-handler-common/pom.xml b/mso-api-handlers/mso-api-handler-common/pom.xml
index 156ce80..b20d64c 100644 (file)
--- a/mso-api-handlers/mso-api-handler-common/pom.xml
+++ b/mso-api-handlers/mso-api-handler-common/pom.xml
@@ -18,8 +18,6 @@
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
                <swagger-version>1.3.0</swagger-version>
                <jax-rs-version>1.1.1</jax-rs-version>
-               <json4s-jackson-version>3.2.4</json4s-jackson-version>
-               <json4s-core-version>3.0.0</json4s-core-version>
                <reflections-version>0.9.9-RC1</reflections-version>
                <paranamer-version>2.5.2</paranamer-version>
                <scannotation-version>1.0.3</scannotation-version>
@@ -63,13 +61,11 @@
                </dependency>
                <dependency>
                        <groupId>org.json4s</groupId>
-                       <artifactId>json4s-jackson_2.9.1-1</artifactId>
-                       <version>${json4s-jackson-version}</version>
+                       <artifactId>json4s-jackson_2.12</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.json4s</groupId>
-                       <artifactId>json4s-core_2.9.2</artifactId>
-                       <version>${json4s-core-version}</version>
+                       <artifactId>json4s-core_2.12</artifactId>
                </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>

diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml
index 9439dca..aaa9b41 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/pom.xml
+++ b/mso-api-handlers/mso-api-handler-infra/pom.xml
@@ -18,8 +18,6 @@
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
                <swagger-version>1.3.0</swagger-version>
                <jax-rs-version>1.1.1</jax-rs-version>
-               <json4s-jackson-version>3.2.4</json4s-jackson-version>
-               <json4s-core-version>3.0.0</json4s-core-version>
                <reflections-version>0.9.9-RC1</reflections-version>
                <paranamer-version>2.5.2</paranamer-version>
                <scannotation-version>1.0.3</scannotation-version>
@@ -98,13 +96,11 @@
                </dependency>
                <dependency>
                        <groupId>org.json4s</groupId>
-                       <artifactId>json4s-jackson_2.9.1-1</artifactId>
-                       <version>${json4s-jackson-version}</version>
+                       <artifactId>json4s-jackson_2.12</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.json4s</groupId>
-                       <artifactId>json4s-core_2.9.2</artifactId>
-                       <version>${json4s-core-version}</version>
+                       <artifactId>json4s-core_2.12</artifactId>
                </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>

diff --git a/pom.xml b/pom.xml
index 078f9b3..2af02be 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -47,9 +47,11 @@
                <sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
                <jacoco.version>0.7.5.201505241946</jacoco.version>
                <org.apache.maven.user-settings/>
-               <openstack.version>1.2.2</openstack.version>
+               <openstack.version>1.3.0</openstack.version>
                <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
                <springboot.version>1.5.13.RELEASE</springboot.version> 
+               <springframework.version>5.0.8.RELEASE</springframework.version>
+               <tomcat.version>8.5.33</tomcat.version>
                <originalClassifier>original</originalClassifier>
                <docker.skip>true</docker.skip>
                <docker.skip.build>true</docker.skip.build>
@@ -761,6 +763,51 @@
                        <artifactId>flyway-core</artifactId>
                        <version>4.2.0</version>
                        </dependency>
+                        <dependency>
+                                <groupId>org.apache.tomcat.embed</groupId>
+                                <artifactId>tomcat-embed-core</artifactId>
+                                <version>${tomcat.version}</version>
+                        </dependency>
+                        <dependency>
+                                <groupId>org.apache.tomcat.embed</groupId>
+                                <artifactId>tomcat-embed-el</artifactId>
+                                <version>${tomcat.version}</version>
+                        </dependency>
+                        <dependency>
+                                <groupId>org.apache.tomcat.embed</groupId>
+                                <artifactId>tomcat-embed-websocket</artifactId>
+                                <version>${tomcat.version}</version>
+                        </dependency>
+                        <dependency>
+                                <groupId>org.apache.tomcat</groupId>
+                                <artifactId>tomcat-annotations-api</artifactId>
+                                <version>${tomcat.version}</version>
+                        </dependency>
+                        <dependency>
+                                <groupId>org.json4s</groupId>
+                                <artifactId>json4s-jackson_2.12</artifactId>
+                                <version>3.6.0</version>
+                        </dependency>
+                        <dependency>
+                                <groupId>org.json4s</groupId>
+                                <artifactId>json4s-core_2.12</artifactId>
+                                <version>3.6.0</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.commons</groupId>
+                            <artifactId>commons-email</artifactId>
+                            <version>1.5</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.immutables</groupId>
+                            <artifactId>value</artifactId>
+                            <version>2.7.1</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.eclipse.jetty</groupId>
+                            <artifactId>jetty-server</artifactId>
+                            <version>9.4.12.v20180830</version>
+                        </dependency>
                </dependencies>
        </dependencyManagement>
        <profiles>