From d750eabf5de2423f0a7c89ffbfbcc0d65bb4623e Mon Sep 17 00:00:00 2001
From: Rob Daugherty <rd472p@att.com>
Date: Wed, 8 Nov 2017 18:35:49 -0500
Subject: Clean up Process Engine selection logic

Several failed attempts to split the BPMN application into
multiple applications with separate camunda process engines
have left a mess of confusing classes and process engine
definitions.

In the Amsterdam release, there should be only one BPMN
application war.  This is MSOInfrastructureBPMN.
MSOCommonBPMN should not be deployed as a separate
application.  Its classes are compiled into a jar and
this is included inside MSOInfrastructureBPMN.

The MSOInfrastructureBPMN application should use the
"default" process engine.

WorkflowAsyncInfrastructureResource and
MSOCommonApplication classes are not needed.

Issue: SO-322
Change-Id: Ifdb3b33541346b561a16361d1aa791e8342a34fa
Signed-off-by: Rob Daugherty <rd472p@att.com>
---
 bpmn/MSOCommonBPMN/pom.xml | 122 ++++++---------------------------------------
 1 file changed, 15 insertions(+), 107 deletions(-)

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

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index 9650b4ca9b..d75d055a7c 100644
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<artifactId>MSOCommonBPMN</artifactId>
 	<name>MSOCommonBPMN</name>
-	<packaging>war</packaging>
+	<packaging>jar</packaging>
 
 	<properties>
 		<camunda.version>7.6.0</camunda.version>
@@ -22,7 +22,6 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 	</properties>
 
-
 	<build>
 		<plugins>
 			<plugin>
@@ -41,67 +40,21 @@
 					</execution>
 				</executions>
 			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.6</version>
+				<version>3.0.2</version>
 				<executions>
-					<execution>
-						<!-- Build MSOCommonBPMN-${version}.jar -->
-						<id>default-jar</id>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<excludes>
-								<exclude>org/openecomp/mso/bpmn/common/MSOCommonApplication.class</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>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.3</version>
-				<configuration>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-codegen-plugin</artifactId>
@@ -244,35 +197,19 @@
 						</lifecycleMappingMetadata>
 					</configuration>
 				</plugin>
-
-
 			</plugins>
 		</pluginManagement>
 	</build>
 
 	<dependencies>
-
 		<dependency>
-			<!-- process engine, in compile scope to include it in the war file -->
 			<groupId>org.camunda.bpm</groupId>
 			<artifactId>camunda-engine</artifactId>
-			<scope>compile</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-api</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
-		<!-- 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 
-				work correctly -->
 			<groupId>org.camunda.bpm</groupId>
 			<artifactId>camunda-engine-cdi</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.camunda.bpm.extension</groupId>
 			<artifactId>camunda-bpm-assert</artifactId>
@@ -284,53 +221,35 @@
 			<version>1.10.19</version>
 			<scope>test</scope>
 		</dependency>
-		
-		<!-- Spin dataformat support, in compile scope to include it in the war 
-			file -->
 		<dependency>
 			<groupId>org.camunda.spin</groupId>
 			<artifactId>camunda-spin-dataformat-all</artifactId>
-			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.camunda.bpm</groupId>
 			<artifactId>camunda-engine-plugin-spin</artifactId>
-			<scope>compile</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.camunda.bpm</groupId>
 			<artifactId>camunda-engine-plugin-connect</artifactId>
-			<scope>compile</scope>
 		</dependency>
-
 		<dependency>
 			<!-- Bootstrap for styling via Webjars project -->
 			<groupId>org.webjars</groupId>
 			<artifactId>bootstrap</artifactId>
 			<version>2.3.2</version>
 		</dependency>
-
 		<dependency>
 			<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>
-					<artifactId>httpclient</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
-
 		<dependency>
 			<!-- Needed for InMemoryH2Test -->
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>com.fasterxml.uuid</groupId>
 			<artifactId>java-uuid-generator</artifactId>
@@ -358,16 +277,15 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-            <groupId>org.openecomp.so</groupId>
-            <artifactId>common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+			<groupId>org.openecomp.so</groupId>
+			<artifactId>common</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>javax.ws.rs</groupId>
 			<artifactId>javax.ws.rs-api</artifactId>
 			<version>2.0</version>
 		</dependency>
-		<!-- for encoding the url the same way A&AI does -->
 		<dependency>
 			<groupId>org.openecomp.so</groupId>
 			<artifactId>MSOMockServer</artifactId>
@@ -380,20 +298,16 @@
 			<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>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>com.github.tomakehurst</groupId>
 			<artifactId>wiremock</artifactId>
@@ -487,14 +401,11 @@
 			<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</version>
 		</dependency>
-		
-		
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
@@ -545,7 +456,6 @@
 			<artifactId>javax.ws.rs-api</artifactId>
 			<version>${jax.ws.rs}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.openecomp.appc.client</groupId>
 			<artifactId>client-kit</artifactId>
@@ -556,7 +466,6 @@
 			<artifactId>client-lib</artifactId>
 			<version>1.1.0</version>
 		</dependency>
-		
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
@@ -595,15 +504,14 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-       <groupId>org.jboss.resteasy</groupId>
-       <artifactId>resteasy-jackson2-provider</artifactId>
-       <version>3.0.11.Final</version>
-    </dependency>
-    <dependency>
-		<groupId>com.google.guava</groupId>
-		<artifactId>guava</artifactId>
-		<version>22.0</version>
-	</dependency>
-				
+			<groupId>org.jboss.resteasy</groupId>
+			<artifactId>resteasy-jackson2-provider</artifactId>
+			<version>3.0.11.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>22.0</version>
+		</dependency>
 	</dependencies>
 </project>
-- 
cgit 1.2.3-korg