From 62cd6aaaf74aa91ee0037c0e155c8e7284f07567 Mon Sep 17 00:00:00 2001
From: Arthur Martella <amartell@research.att.com>
Date: Fri, 8 Sep 2017 13:27:46 -0400
Subject: 1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>
---
 bpmn/MSOInfrastructureBPMN/pom.xml | 47 +++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 13 deletions(-)

(limited to 'bpmn/MSOInfrastructureBPMN/pom.xml')

diff --git a/bpmn/MSOInfrastructureBPMN/pom.xml b/bpmn/MSOInfrastructureBPMN/pom.xml
index 5c0eff96bb..24c8546b8d 100644
--- a/bpmn/MSOInfrastructureBPMN/pom.xml
+++ b/bpmn/MSOInfrastructureBPMN/pom.xml
@@ -214,13 +214,7 @@
 			<version>1.10.19</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<!-- Optional Plugin for Camunda BPM Workbench -->
-			<groupId>org.camunda.bpm.workbench</groupId>
-			<artifactId>camunda-workbench-dist-embeddable</artifactId>
-			<version>1.0.0-alpha8</version>
-			<scope>test</scope>
-		</dependency>
+		
 
 		<!-- Spin dataformat support, in compile scope to include it in the war
 			file -->
@@ -229,6 +223,11 @@
 			<artifactId>camunda-spin-dataformat-all</artifactId>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<artifactId>camunda-spin-dataformat-all</artifactId>
+			<groupId>org.camunda.spin</groupId>
+			<scope>compile</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.camunda.bpm</groupId>
 			<artifactId>camunda-engine-plugin-spin</artifactId>
@@ -330,6 +329,13 @@
   	  <version>${project.version}</version>
 	</dependency>
 
+    <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>3.0.1</version>
+        <scope>provided</scope>
+    </dependency>
+
 	<dependency>
 			<groupId>com.github.tomakehurst</groupId>
 			<artifactId>wiremock</artifactId>
@@ -380,10 +386,25 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-	        <groupId>javax.servlet</groupId>
-	        <artifactId>javax.servlet-api</artifactId>
-	        <version>3.0.1</version>
-	        <scope>provided</scope>
-	    </dependency>
+      		<groupId>org.camunda.bpm</groupId>
+      		<artifactId>camunda-engine-spring</artifactId>
+   		</dependency>
+   		<dependency>
+    <groupId>org.springframework</groupId>
+    <artifactId>spring-beans</artifactId>
+    <version>4.3.2.RELEASE</version>
+</dependency>
+<dependency>
+			<!-- Optional Plugin for Camunda BPM Workbench -->
+			<groupId>org.camunda.bpm.workbench</groupId>
+			<artifactId>camunda-workbench-dist-embeddable</artifactId>
+			<version>1.0.0-alpha8</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+       <groupId>org.jboss.resteasy</groupId>
+       <artifactId>resteasy-jackson2-provider</artifactId>
+       <version>3.0.11.Final</version>
+    </dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
-- 
cgit 1.2.3-korg