Merge "Added ConfigurationScaleOutBB, tasks, and tests"

diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn
index 515a9bb..3b49011 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateVcpeResCustService.bpmn
@@ -98,7 +98,6 @@ ex.processJavaException(execution)]]></bpmn2:script>
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:out source="serviceInstanceName" target="serviceInstanceName" />
         <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
-        <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" />
         <camunda:in source="productFamilyId" target="productFamilyId" />
         <camunda:in source="sdncVersion" target="sdncVersion" />
         <camunda:in source="bpmnRequest" target="requestJson" />

diff --git a/common/src/main/java/org/onap/so/client/aai/AAIVersion.java b/common/src/main/java/org/onap/so/client/aai/AAIVersion.java
index 20ee5be..de418f3 100644 (file)
--- a/common/src/main/java/org/onap/so/client/aai/AAIVersion.java
+++ b/common/src/main/java/org/onap/so/client/aai/AAIVersion.java
@@ -28,7 +28,8 @@ public enum AAIVersion implements GraphInventoryVersion {
        V10("v10"), 
        V11("v11"), 
        V12("v12"),
-       V13("v13");
+       V13("v13"),
+       V14("v14");
        
        public final static AAIVersion LATEST = AAIVersion.values()[AAIVersion.values().length - 1];
        private final String value;

diff --git a/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml b/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml
index 8f541d6..5c88943 100644 (file)
--- a/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml
+++ b/packages/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml
@@ -161,7 +161,6 @@
 
     <root level="WARN">
         <appender-ref ref="asyncDebug" />
-        <appender-ref ref="SANE" />
         <appender-ref ref="asyncError" />
     </root>