From bdaffefc010f006019607a689f553ac4184888ee Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@us.att.com>
Date: Mon, 8 Apr 2019 09:31:59 -0400
Subject: Fix POM to allow HTTP long polling to work

Fix POM to allow HTTP long polling to work on camunda

Change-Id: I5f9da8b88ad8b14a1ef596f65b95d941c130e794
Issue-ID: SO-1758
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 .../java/org/onap/so/adapters/audit/AuditStackService.java  |  4 ++--
 .../adapters/inventory/create/CreateInventoryService.java   |  2 +-
 bpmn/mso-infrastructure-bpmn/pom.xml                        | 13 +++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/audit/AuditStackService.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/audit/AuditStackService.java
index 1e16c2a016..ed29a1c47d 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/audit/AuditStackService.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/audit/AuditStackService.java
@@ -63,7 +63,7 @@ public class AuditStackService {
 				auth);
 		ExternalTaskClient client = ExternalTaskClient.create()
 				.baseUrl(env.getRequiredProperty("mso.workflow.endpoint")).maxTasks(1).addInterceptor(interceptor)
-				.asyncResponseTimeout(120000).build();
+				.asyncResponseTimeout(120000).backoffStrategy(new ExponentialBackoffStrategy(0, 0, 0)).build();
 		client.subscribe("InventoryAddAudit").lockDuration(60000)
 				.handler(auditCreateStack::executeExternalTask).open();
 	}
@@ -80,7 +80,7 @@ public class AuditStackService {
 				auth);
 		ExternalTaskClient client = ExternalTaskClient.create()
 				.baseUrl(env.getRequiredProperty("mso.workflow.endpoint")).maxTasks(1).addInterceptor(interceptor)
-				.asyncResponseTimeout(120000).build();
+				.asyncResponseTimeout(120000).backoffStrategy(new ExponentialBackoffStrategy(0,0,0)).build();
 		client.subscribe("InventoryDeleteAudit").lockDuration(60000)
 				.handler(auditDeleteStack::executeExternalTask).open();
 	}
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/inventory/create/CreateInventoryService.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/inventory/create/CreateInventoryService.java
index b2eadaf3c8..58d8a4cd55 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/inventory/create/CreateInventoryService.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/inventory/create/CreateInventoryService.java
@@ -60,7 +60,7 @@ public class CreateInventoryService {
 				auth);
 		ExternalTaskClient client = ExternalTaskClient.create()
 				.baseUrl(env.getRequiredProperty("mso.workflow.endpoint")).maxTasks(1).addInterceptor(interceptor)
-				.asyncResponseTimeout(120000).backoffStrategy(new ExponentialBackoffStrategy(10000, 2, 120000)).build();
+				.asyncResponseTimeout(120000).backoffStrategy(new ExponentialBackoffStrategy(0, 0, 0)).build();
 		client.subscribe("InventoryCreate").lockDuration(60000)
 				.handler(createInventory::executeExternalTask).open();
 	}
diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml
index 6f0b1f6fc9..2abea6e31f 100644
--- a/bpmn/mso-infrastructure-bpmn/pom.xml
+++ b/bpmn/mso-infrastructure-bpmn/pom.xml
@@ -153,11 +153,6 @@
 			<artifactId>camunda-bpm-spring-boot-starter</artifactId>
 			<version>${camunda.springboot.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.camunda.bpm.springboot</groupId>
-			<artifactId>camunda-bpm-spring-boot-starter-webapp</artifactId>
-			<version>${camunda.springboot.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.camunda.bpm.springboot</groupId>
 			<artifactId>camunda-bpm-spring-boot-starter-rest</artifactId>
@@ -166,7 +161,13 @@
 		<dependency>
 			<groupId>org.camunda.bpm.springboot</groupId>
 			<artifactId>camunda-bpm-spring-boot-starter-webapp</artifactId>
-			<version>2.3.0</version>
+			<version>${camunda.springboot.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.camunda.bpmn</groupId>
+					<artifactId>camunda-engine-rest-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-- 
cgit 1.2.3-korg