Merge "version upgrades plus cleanup"

2 files changed, 7 insertions, 37 deletions

diff --git a/bpmn/so-bpmn-infrastructure-common/pom.xml b/bpmn/so-bpmn-infrastructure-common/pom.xml
index 90f9a57191..c6a4ffc01d 100644
--- a/bpmn/so-bpmn-infrastructure-common/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-common/pom.xml
@@ -38,7 +38,6 @@
         <configuration>
           <compilerId>groovy-eclipse-compiler</compilerId>
         </configuration>
-
         <dependencies>
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
@@ -114,19 +113,6 @@
     </pluginManagement>
     <finalName>${project.artifactId}-${project.version}</finalName>
   </build>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.camunda.bpm</groupId>
-        <artifactId>camunda-bom</artifactId>
-        <version>${camunda.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>org.camunda.bpm.springboot</groupId>
@@ -146,10 +132,11 @@
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-    </dependency>
+ <dependency>
+    <groupId>org.apache.cxf</groupId>
+    <artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
+    <version>3.4.2</version>
+</dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
@@ -254,7 +241,6 @@
     <dependency>
       <groupId>ch.vorburger.mariaDB4j</groupId>
       <artifactId>mariaDB4j</artifactId>
-      <version>2.3.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceOption.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceOption.groovy
index ac7f1af890..91a69b3123 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceOption.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceOption.groovy
@@ -134,7 +134,6 @@ class DoCreateSliceServiceOption extends AbstractServiceTaskProcessor{
             "modelVersion":""
              }"""
         execution.setVariable("nsstServiceModelInfo", serviceModelInfo)
-
     }
 
     /**
@@ -165,7 +164,6 @@ class DoCreateSliceServiceOption extends AbstractServiceTaskProcessor{
         } else {
             execution.setVariable("nsstHandleContinue", true)
         }
-
     }
 
     /**
@@ -193,7 +191,7 @@ class DoCreateSliceServiceOption extends AbstractServiceTaskProcessor{
     }
 
     private void handleByType(DelegateExecution execution, ServiceDecomposition serviceDecomposition,
-                              SliceTaskParamsAdapter sliceParams, List<SubnetCapability> subnetCapabilities) {
+            SliceTaskParamsAdapter sliceParams, List<SubnetCapability> subnetCapabilities) {
         ModelInfo modelInfo = serviceDecomposition.getModelInfo()
         String vendor = serviceDecomposition.getServiceRole()
         SubnetType subnetType = convertServiceCategory(serviceDecomposition.getServiceCategory())
@@ -535,20 +533,6 @@ class DoCreateSliceServiceOption extends AbstractServiceTaskProcessor{
         boolean needAnNssiSelection = execution.getVariable("NEED_AN_NSSI_SELECTION") as Boolean
         boolean needTnNssiSelection = execution.getVariable("NEED_TN_NSSI_SELECTION") as Boolean
 
-        /**
-         * [
-         * ​	{
-         * ​		"subType":  subtype,
-         * ​		"nsstInfo": object,
-         * ​		"sliceProfile": object
-         * ​	},
-         *      {
-         *          "subType":  subtype,
-         *          "nsstInfo": object,
-         *          "sliceProfile": object
-         *      }
-         * ]
-         */
         List<Map> nssiNeedHandlerInfos = new ArrayList<>()
         Map<String, Object> nssiNeedHandlerMap = new HashMap()
 
@@ -685,7 +669,7 @@ class DoCreateSliceServiceOption extends AbstractServiceTaskProcessor{
     }
 
     private void processNssiResult(SliceTaskParamsAdapter sliceTaskParams, SubnetType subnetType,
-                                   Map<String, Object> solution) {
+            Map<String, Object> solution) {
         switch (subnetType) {
             case SubnetType.CN:
                 sliceTaskParams.cnSliceTaskInfo.suggestNssiId = solution.get("NSSIId")