aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bpmn/pom.xml6
-rw-r--r--bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java7
-rw-r--r--pom.xml6
3 files changed, 11 insertions, 8 deletions
diff --git a/bpmn/pom.xml b/bpmn/pom.xml
index ebf4481fdb..4e36b775f5 100644
--- a/bpmn/pom.xml
+++ b/bpmn/pom.xml
@@ -18,7 +18,6 @@
<camunda.version>7.8.0</camunda.version>
<camunda.bpm.assert.version>1.2</camunda.bpm.assert.version>
<camunda.bpm.webapp.artifact>camunda-webapp-jboss-standalone</camunda.bpm.webapp.artifact>
- <h2.version>1.4.196</h2.version>
<groovy.version>2.4.8</groovy.version>
<saxon.version>9.5.1-8</saxon.version>
<xmlunit.version>2.4.0</xmlunit.version>
@@ -43,11 +42,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${h2.version}</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
index 98e552f9c3..5fe28b918b 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
@@ -417,8 +417,11 @@ public class ServicePluginFactory {
Map<String, Object> vpnRequestInputs = getVPNResourceRequestInputs(resources);
// here we put client signal to vpn resource inputs
- vpnRequestInputs.put("src-client-signal", srcClientSignal);
- vpnRequestInputs.put("dst-client-signal", dstClientSignal);
+ if(null!=vpnRequestInputs) {
+ vpnRequestInputs.put("src-client-signal", srcClientSignal);
+ vpnRequestInputs.put("dst-client-signal", dstClientSignal);
+ }
+
// Now we need to query terminal points from SP resourcemgr system.
List<Object> locationTerminalPointList = queryTerminalPointsFromServiceProviderSystem(srcLocation, dstLocation);
diff --git a/pom.xml b/pom.xml
index 2af02bed2d..3d78f5220c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
<springboot.version>1.5.13.RELEASE</springboot.version>
<springframework.version>5.0.8.RELEASE</springframework.version>
<tomcat.version>8.5.33</tomcat.version>
+ <h2.version>1.4.196</h2.version>
<originalClassifier>original</originalClassifier>
<docker.skip>true</docker.skip>
<docker.skip.build>true</docker.skip.build>
@@ -808,6 +809,11 @@
<artifactId>jetty-server</artifactId>
<version>9.4.12.v20180830</version>
</dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<profiles>