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>

1 files changed, 322 insertions, 115 deletions

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index 3452fe3fdd..24c881d566 100644
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -1,34 +1,47 @@
 <?xml version="1.0"?>

-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+<project

+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"

+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 	<modelVersion>4.0.0</modelVersion>

 	<parent>

 		<groupId>org.openecomp.so</groupId>

-    	<artifactId>bpmn</artifactId>

-    	<version>1.1.0-SNAPSHOT</version>

-  	</parent>

-  	<artifactId>MSOCommonBPMN</artifactId>

-  	<name>MSOCommonBPMN</name>

-  	<packaging>war</packaging>

+		<artifactId>bpmn</artifactId>

+		<version>1.1.0-SNAPSHOT</version>

+	</parent>

+	<artifactId>MSOCommonBPMN</artifactId>

+	<name>MSOCommonBPMN</name>

+	<packaging>war</packaging>

+

+	<properties>

+		<camunda.version>7.6.0</camunda.version>

+		<spring.version>3.1.2.RELEASE</spring.version>

+		<httpclient.version>3.1</httpclient.version>

+		<jax.ws.rs>2.0.1</jax.ws.rs>

+		<springmvc>4.1.4.RELEASE</springmvc>

+		<jackson.version>1.1.1</jackson.version>

+		<maven.compiler.target>1.8</maven.compiler.target>

+		<maven.compiler.source>1.8</maven.compiler.source>

+	</properties>

+

 

 	<build>

 		<plugins>

-		    <plugin>

-                    <groupId>org.apache.maven.plugins</groupId>

-                    <artifactId>maven-compiler-plugin</artifactId>

-                    <executions>

-                        <execution>

-                            <id>test-compile</id>

-                            <phase>compile</phase>

-                            <goals>

-                                <goal>testCompile</goal>

-                            </goals>

-                            <configuration>

-                                <skip>false</skip>

-                            </configuration>

-                        </execution>

-                    </executions>

-            </plugin>

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-compiler-plugin</artifactId>

+				<executions>

+					<execution>

+						<id>test-compile</id>

+						<phase>compile</phase>

+						<goals>

+							<goal>testCompile</goal>

+						</goals>

+						<configuration>

+							<skip>false</skip>

+						</configuration>

+					</execution>

+				</executions>

+			</plugin>

 

 			<plugin>

 				<groupId>org.apache.maven.plugins</groupId>

@@ -36,58 +49,58 @@
 				<version>2.6</version>

 				<executions>

 					<execution>

- 						<!-- Build MSOCommonBPMN-${version}.jar -->

+						<!-- Build MSOCommonBPMN-${version}.jar -->

 						<id>default-jar</id>

 						<phase>package</phase>

 						<goals>

 							<goal>jar</goal>

 						</goals>

 						<configuration>

-                        	<excludes>

+							<excludes>

 								<exclude>org/openecomp/mso/bpmn/common/MSOCommonApplication.class</exclude>

-<!-- 								<exclude>META-INF/</exclude> -->

+								<!-- <exclude>META-INF/</exclude> -->

 							</excludes>

 						</configuration>

 					</execution>

-	               	<execution>

-	                	<goals>

-	                		<goal>test-jar</goal>

-	                    </goals>

-	                    <configuration>

-	                       <forceCreation>true</forceCreation>

-	                       <skip>false</skip>

-	                    </configuration>

-	                </execution>

-               </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>3.0.0</version>

-                <executions>

-                    <execution>

-                    <goals>

-                        <goal>attach-artifact</goal>

-                    </goals>

-                    <phase>package</phase>

-                        <configuration>

-                            <artifacts>

-                                <artifact>

-                                    <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file>

-                                    <type>jar</type>

-                                </artifact>

-                            </artifacts>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

+					<execution>

+						<goals>

+							<goal>test-jar</goal>

+						</goals>

+						<configuration>

+							<forceCreation>true</forceCreation>

+							<skip>false</skip>

+						</configuration>

+					</execution>

+				</executions>

+			</plugin>

+			<plugin>

+				<groupId>org.codehaus.mojo</groupId>

+				<artifactId>build-helper-maven-plugin</artifactId>

+				<version>3.0.0</version>

+				<executions>

+					<execution>

+						<goals>

+							<goal>attach-artifact</goal>

+						</goals>

+						<phase>package</phase>

+						<configuration>

+							<artifacts>

+								<artifact>

+									<file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file>

+									<type>jar</type>

+								</artifact>

+							</artifacts>

+						</configuration>

+					</execution>

+				</executions>

+			</plugin>

 

 			<plugin>

 				<groupId>org.apache.maven.plugins</groupId>

 				<artifactId>maven-war-plugin</artifactId>

 				<version>2.3</version>

 				<configuration>

-				    <failOnMissingWebXml>false</failOnMissingWebXml>

+					<failOnMissingWebXml>false</failOnMissingWebXml>

 				</configuration>

 			</plugin>

 			<plugin>

@@ -96,18 +109,18 @@
 				<version>2.5.2</version>

 			</plugin>

 			<plugin>

-            	<groupId>org.apache.maven.plugins</groupId>

-            	<artifactId>maven-eclipse-plugin</artifactId>

-            	<version>2.8</version>

-            	<configuration>

-                	<additionalProjectnatures>

-                    	<projectnature>org.eclipse.jdt.groovy.core.groovyNature</projectnature>

-                	</additionalProjectnatures>

-                	<sourceIncludes>

-                    	<sourceInclude>**/*.groovy</sourceInclude>

-                	</sourceIncludes>

-            	</configuration>

-        	</plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-eclipse-plugin</artifactId>

+				<version>2.8</version>

+				<configuration>

+					<additionalProjectnatures>

+						<projectnature>org.eclipse.jdt.groovy.core.groovyNature</projectnature>

+					</additionalProjectnatures>

+					<sourceIncludes>

+						<sourceInclude>**/*.groovy</sourceInclude>

+					</sourceIncludes>

+				</configuration>

+			</plugin>

 			<plugin>

 				<artifactId>maven-antrun-plugin</artifactId>

 				<executions>

@@ -153,10 +166,54 @@
 					</execution>

 				</executions>

 			</plugin>

+			<plugin>

+				<groupId>org.codehaus.mojo</groupId>

+				<artifactId>jaxb2-maven-plugin</artifactId>

+				<version>2.3</version>

+				<executions>

+					<execution>

+						<id>xjc</id>

+						<goals>

+							<goal>xjc</goal>

+						</goals>

+					</execution>

+				</executions>

+				<configuration>

+					<extension>true</extension>

+					<arguments>

+						<argument>-Xannotate</argument>

+						<argument>-Xcommons-lang</argument>

+					</arguments>

+					<sources>

+						<source>src/main/resources/xsd</source>

+					</sources>

+					<xjbSources>

+						<xjbSource>src/main/resources/xjb</xjbSource>

+					</xjbSources>

+					<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>

+				</configuration>

+				<dependencies>

+					<dependency>

+						<groupId>org.jvnet.jaxb2_commons</groupId>

+						<artifactId>jaxb2-basics-annotate</artifactId>

+						<version>0.6.4</version>

+					</dependency>

+					<dependency>

+						<groupId>org.jvnet.jaxb2_commons</groupId>

+						<artifactId>jaxb2-commons-lang</artifactId>

+						<version>2.3</version>

+					</dependency>

+					<dependency>

+						<groupId>com.sun.codemodel</groupId>

+						<artifactId>codemodel</artifactId>

+						<version>2.6</version>

+					</dependency>

+				</dependencies>

+			</plugin>

 		</plugins>

 		<pluginManagement>

 			<plugins>

-				<!--This plugin's configuration is used to store Eclipse m2e settings

+				<!--This plugin's configuration is used to store Eclipse m2e settings 

 					only. It has no influence on the Maven build itself. -->

 				<plugin>

 					<groupId>org.eclipse.m2e</groupId>

@@ -188,6 +245,8 @@
 						</lifecycleMappingMetadata>

 					</configuration>

 				</plugin>

+

+

 			</plugins>

 		</pluginManagement>

 	</build>

@@ -206,20 +265,18 @@
 				</exclusion>

 			</exclusions>

 		</dependency>

-		<!-- Using the `DefaultEjbProcessApplication` result in: `java.sql.SQLException:

+		<!-- Using the `DefaultEjbProcessApplication` result in: `java.sql.SQLException: 

 			You cannot commit during a managed transaction!` -->

 		<dependency>

-			<!-- CDI integration, needs to be included in WAR, otherwise CDI can not

+			<!-- CDI integration, needs to be included in WAR, otherwise CDI can not 

 				work correctly -->

 			<groupId>org.camunda.bpm</groupId>

 			<artifactId>camunda-engine-cdi</artifactId>

 		</dependency>

 

 		<dependency>

-			<!-- AssertJ Testing Library -->

 			<groupId>org.camunda.bpm.extension</groupId>

 			<artifactId>camunda-bpm-assert</artifactId>

-			<version>1.2</version>

 			<scope>test</scope>

 		</dependency>

 		<dependency>

@@ -228,15 +285,8 @@
 			<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

+		

+		<!-- Spin dataformat support, in compile scope to include it in the war 

 			file -->

 		<dependency>

 			<groupId>org.camunda.spin</groupId>

@@ -263,10 +313,10 @@
 		</dependency>

 

 		<dependency>

-		    <groupId>org.jboss.resteasy</groupId>

-		    <artifactId>resteasy-client</artifactId>

-		    <version>3.0.19.Final</version>

-		    <scope>provided</scope>

+			<groupId>org.jboss.resteasy</groupId>

+			<artifactId>resteasy-client</artifactId>

+			<version>3.0.19.Final</version>

+			<scope>provided</scope>

 			<exclusions>

 				<exclusion>

 					<groupId>org.apache.httpcomponents</groupId>

@@ -313,33 +363,34 @@
 			<artifactId>javax.ws.rs-api</artifactId>

 			<version>2.0</version>

 		</dependency>

-		<!-- 		for encoding the url the same way A&AI does -->

-	<dependency>

-	   <groupId>org.springframework</groupId>

-    	<artifactId>spring-web</artifactId>

-    	<version>4.3.2.RELEASE</version>

-	</dependency>

-	<dependency>

-		<groupId>org.openecomp.so</groupId>

-		<artifactId>MSOMockServer</artifactId>

-		<version>${project.version}</version>

-		<classifier>classes</classifier>

-		<scope>test</scope>

-	</dependency>

-	<dependency>

-	  <groupId>org.openecomp.so</groupId>

-  	  <artifactId>MSORESTClient</artifactId>

-  	  <version>${project.version}</version>

-	</dependency>

+		<!-- for encoding the url the same way A&AI does -->

+		<dependency>

+			<groupId>org.openecomp.so</groupId>

+			<artifactId>MSOMockServer</artifactId>

+			<version>${project.version}</version>

+			<classifier>classes</classifier>

+			<scope>test</scope>

+		</dependency>

+		<dependency>

+			<groupId>org.openecomp.so</groupId>

+			<artifactId>MSORESTClient</artifactId>

+			<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>javax.servlet</groupId>

+			<artifactId>javax.servlet-api</artifactId>

+			<version>3.0.1</version>

+			<scope>provided</scope>

+		</dependency>

 

-	<dependency>

+		<dependency>

+			<groupId>org.springframework</groupId>

+			<artifactId>spring-test</artifactId>

+			<version>4.3.2.RELEASE</version>

+		</dependency>

+

+		<dependency>

 			<groupId>com.github.tomakehurst</groupId>

 			<artifactId>wiremock</artifactId>

 			<version>1.56</version>

@@ -388,5 +439,161 @@
 				</exclusion>

 			</exclusions>

 		</dependency>

+		<dependency>

+			<groupId>org.camunda.bpm</groupId>

+			<artifactId>camunda-engine-spring</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>org.springframework</groupId>

+			<artifactId>spring-beans</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>com.fasterxml.jackson.core</groupId>

+			<artifactId>jackson-annotations</artifactId>

+			<version>2.8.7</version>

+		</dependency>

+		<dependency>

+			<groupId>com.fasterxml.jackson.core</groupId>

+			<artifactId>jackson-core</artifactId>

+			<version>2.8.7</version>

+		</dependency>

+		<dependency>

+			<groupId>com.fasterxml.jackson.module</groupId>

+			<artifactId>jackson-module-jaxb-annotations</artifactId>

+			<version>2.4.0</version>

+		</dependency>

+		<dependency>

+			<groupId>org.aspectj</groupId>

+			<artifactId>aspectjrt</artifactId>

+			<version>1.6.12</version>

+		</dependency>

+		<dependency>

+			<groupId>commons-httpclient</groupId>

+			<artifactId>commons-httpclient</artifactId>

+			<version>${httpclient.version}</version>

+		</dependency>

+		<dependency>

+			<groupId>org.openecomp.appc.client</groupId>

+			<artifactId>client-kit</artifactId>

+			<version>1.1.0</version>

+		</dependency>

+		<dependency>

+			<groupId>org.openecomp.appc.client</groupId>

+			<artifactId>client-lib</artifactId>

+			<version>1.1.0</version>

+		</dependency>

+		

+		<dependency>

+			<groupId>org.onap.aai.aai-common</groupId>

+			<artifactId>aai-schema</artifactId>

+			<version>1.1.0-SNAPSHOT</version>

+		</dependency>

+		

+		

+		<dependency>

+			<groupId>com.fasterxml.jackson.core</groupId>

+			<artifactId>jackson-databind</artifactId>

+			<version>2.8.7</version>

+		</dependency>

+		<dependency>

+			<groupId>org.mockito</groupId>

+			<artifactId>mockito-all</artifactId>

+			<version>1.10.19</version>

+		</dependency>

+		<dependency>

+			<groupId>commons-lang</groupId>

+			<artifactId>commons-lang</artifactId>

+			<version>2.6</version>

+		</dependency>

+		<dependency>

+			<groupId>com.openpojo</groupId>

+			<artifactId>openpojo</artifactId>

+			<version>0.8.6</version>

+		</dependency>

+		<dependency>

+			<groupId>com.jayway.jsonpath</groupId>

+			<artifactId>json-path</artifactId>

+			<version>2.2.0</version>

+		</dependency>

+		<dependency>

+			<groupId>org.springframework</groupId>

+			<artifactId>spring-web</artifactId>

+			<version>4.3.2.RELEASE</version>

+		</dependency>

+		<dependency>

+			<groupId>org.springframework</groupId>

+			<artifactId>spring-test</artifactId>

+			<version>${spring.version}</version>

+		</dependency>

+		<dependency>

+			<groupId>junit</groupId>

+			<artifactId>junit</artifactId>

+			<version>4.12</version>

+		</dependency>

+		<dependency>

+			<groupId>commons-httpclient</groupId>

+			<artifactId>commons-httpclient</artifactId>

+			<version>${httpclient.version}</version>

+		</dependency>

+		<dependency>

+			<groupId>javax.ws.rs</groupId>

+			<artifactId>javax.ws.rs-api</artifactId>

+			<version>${jax.ws.rs}</version>

+		</dependency>

+

+		<dependency>

+			<groupId>org.openecomp.appc.client</groupId>

+			<artifactId>client-kit</artifactId>

+			<version>1.1.0</version>

+		</dependency>

+		<dependency>

+			<groupId>org.openecomp.appc.client</groupId>

+			<artifactId>client-lib</artifactId>

+			<version>1.1.0</version>

+		</dependency>

+		

+		<dependency>

+			<groupId>com.fasterxml.jackson.core</groupId>

+			<artifactId>jackson-databind</artifactId>

+			<version>2.8.7</version>

+		</dependency>

+		<dependency>

+			<groupId>com.fasterxml.jackson.core</groupId>

+			<artifactId>jackson-annotations</artifactId>

+			<version>2.8.7</version>

+		</dependency>

+		<dependency>

+			<groupId>com.fasterxml.jackson.module</groupId>

+			<artifactId>jackson-module-jaxb-annotations</artifactId>

+			<version>2.4.0</version>

+		</dependency>

+		<dependency>

+			<groupId>org.aspectj</groupId>

+			<artifactId>aspectjrt</artifactId>

+			<version>1.6.12</version>

+		</dependency>

+		<dependency>

+			<groupId>org.mockito</groupId>

+			<artifactId>mockito-all</artifactId>

+			<version>1.10.19</version>

+		</dependency>

+		<dependency>

+			<groupId>com.att.nsa</groupId>

+			<artifactId>dmaapClient</artifactId>

+			<version>0.2.12</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>