X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=bpmn%2FMSOCommonBPMN%2Fpom.xml;h=934aea824179d3967dcde162007c7483e1816895;hb=1d3b5459ef6525b4d4de8b3c652582babf31b9c5;hp=32e7d4a6aca76e6eb95bd77b9515f6385caac2e2;hpb=413b3778a110964cd4b5e3cca3c4a7622e25df07;p=so.git

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index 32e7d4a6ac..934aea8241 100644
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -6,23 +6,17 @@
 	<parent>
 		<groupId>org.onap.so</groupId>
 		<artifactId>bpmn</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>MSOCommonBPMN</artifactId>
 	<name>MSOCommonBPMN</name>
 	<packaging>jar</packaging>
 
 	<properties>
-		<camunda.version>7.8.0</camunda.version>
-		<spring.version>4.3.2.RELEASE</spring.version>
-		<httpclient.version>4.5.5</httpclient.version>
-		<jax.ws.rs>2.0.1</jax.ws.rs>
-		<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>
@@ -53,6 +47,9 @@
 						</goals>
 						<configuration>
 							<skip>false</skip>
+							<excludes>
+								<exclude>**/validation/*</exclude>
+							</excludes>
 						</configuration>
 					</execution>
 				</executions>
@@ -121,97 +118,48 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jaxb2-maven-plugin</artifactId>
-				<version>2.3</version>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>xjc</id>
+						<id>default-test</id>
 						<goals>
-							<goal>xjc</goal>
+							<goal>test</goal>
 						</goals>
+						<configuration>
+							<includes>
+								<include>**/AllTestSuites.java</include>
+							</includes>
+						</configuration>
+					</execution>
+					<execution>
+						<id>non-spring-tests</id>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<includes>
+								<include>**/NonSpringSuite.java</include>
+							</includes>
+						</configuration>
 					</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>
-			 <plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jaxb2-maven-plugin</artifactId>
-				<version>2.3</version>
-				<executions>
 					<execution>
-						<id>xjc</id>
+						<id>groovy-tests</id>
 						<goals>
-							<goal>xjc</goal>
+							<goal>test</goal>
 						</goals>
+						<configuration>
+							<includes>
+								<include>**/AllGroovyTestSuites.java</include>
+							</includes>
+						</configuration>
 					</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>
@@ -243,95 +191,90 @@
 						</lifecycleMappingMetadata>
 					</configuration>
 				</plugin>
-
-
 			</plugins>
 		</pluginManagement>
 	</build>
-
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<!-- Import dependency management from camunda -->
+				<groupId>org.camunda.bpm</groupId>
+				<artifactId>camunda-bom</artifactId>
+				<version>${camunda.version}</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<dependencies>
-
 		<dependency>
-			<groupId>org.camunda.bpm</groupId>
-			<artifactId>camunda-engine</artifactId>
+			<groupId>org.camunda.bpm.springboot</groupId>
+			<artifactId>camunda-bpm-spring-boot-starter</artifactId>
+			<version>${camunda.springboot.version}</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.camunda.bpm</groupId>
-			<artifactId>camunda-engine-cdi</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-wiremock</artifactId>
+			<version>1.2.4.RELEASE</version>
+			<scope>test</scope>
 		</dependency>
-
 		<dependency>
-			<groupId>org.camunda.bpm.extension</groupId>
-			<artifactId>camunda-bpm-assert</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.camunda.spin</groupId>
-			<artifactId>camunda-spin-dataformat-all</artifactId>
+			<groupId>org.camunda.bpm.extension.mockito</groupId>
+			<artifactId>camunda-bpm-mockito</artifactId>
+			<version>3.2.1</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.camunda.bpm</groupId>
-			<artifactId>camunda-engine-plugin-spin</artifactId>
+			<groupId>org.camunda.connect</groupId>
+			<artifactId>camunda-connect-connectors-all</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>org.camunda.bpm</groupId>
-			<artifactId>camunda-engine-plugin-connect</artifactId>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.9.3</version>
 		</dependency>
-
 		<dependency>
-			<!-- Bootstrap for styling via Webjars project -->
-			<groupId>org.webjars</groupId>
-			<artifactId>bootstrap</artifactId>
-			<version>2.3.2</version>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
 		</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>
-		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-all</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.4</version>
-		</dependency>
 		<dependency>
 			<groupId>org.onap.so</groupId>
 			<artifactId>MSOCoreBPMN</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<!-- unit test utilities -->
 			<groupId>org.onap.so</groupId>
-			<artifactId>MSOCoreBPMN</artifactId>
+			<artifactId>mso-catalog-db</artifactId>
 			<version>${project.version}</version>
-			<classifier>tests</classifier>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.onap.so</groupId>
-			<artifactId>common</artifactId>
+			<artifactId>mso-requests-db</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>javax.ws.rs-api</artifactId>
-			<version>2.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.onap.so</groupId>
-			<artifactId>MSORESTClient</artifactId>
+			<artifactId>common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -342,162 +285,123 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>4.3.14.RELEASE</version>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.sdc.sdc-tosca</groupId>
-			<artifactId>sdc-tosca</artifactId>
-			<version>1.3.3</version>
-			<!-- sdc-tosca:1.3.3 depends on jtosca:1.3.4-SNAPSHOT,
-			     which must be excluded, and the release version
-			     of jtosca must be pulled in using an additional
-			     dependency, below -->
-			<exclusions>
-				<exclusion>
-					<groupId>org.onap.sdc.jtosca</groupId>
-					<artifactId>jtosca</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.sdc.jtosca</groupId>
-			<artifactId>jtosca</artifactId>
-			<version>1.3.4</version>
-		</dependency>
-		<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>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-			<version>1.6.12</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>${httpclient.version}</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>${spring.version}</version>
-		</dependency>
-		<!-- bwj: duplicated one
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		-->
-		<!-- bwj: added -->
-		<dependency>
-			<groupId>com.googlecode.libphonenumber</groupId>
-			<artifactId>libphonenumber</artifactId>
-			<version>8.9.1</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.ws.rs</groupId>
 			<artifactId>javax.ws.rs-api</artifactId>
 			<version>${jax.ws.rs}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.onap.appc.client</groupId>
 			<artifactId>client-lib</artifactId>
 			<version>1.3.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.mockito</groupId>
+					<artifactId>mockito-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.powermock</groupId>
+					<artifactId>powermock-module-junit4</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.powermock</groupId>
+					<artifactId>powermock-api-mockito</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
-  			<groupId>org.onap.appc.client</groupId>
-  			<artifactId>client-kit</artifactId>
-  			<version>1.3.0</version>
+			<groupId>org.onap.appc.client</groupId>
+			<artifactId>client-kit</artifactId>
+			<version>1.3.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.mockito</groupId>
+					<artifactId>mockito-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>
-			<version>1.6.12</version>
 		</dependency>
 		<dependency>
-			<groupId>com.att.nsa</groupId>
-			<artifactId>saClientLibrary</artifactId>
-<!--			<version>1.2.4</version> -->
-			<version>1.3.0-oss</version>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
 		</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>
+			<groupId>org.glassfish.jersey.core</groupId>
+			<artifactId>jersey-common</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.core</groupId>
+			<artifactId>jersey-client</artifactId>
 		</dependency>
-    	<dependency>
-    		<groupId>org.json</groupId>
-        	<artifactId>json</artifactId>
-        	<version>20160810</version>
+		<dependency>
+        	<groupId>org.glassfish.jersey.inject</groupId>
+       		<artifactId>jersey-hk2</artifactId>
+       		<version>2.26</version>
     	</dependency>
 		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-core</artifactId>
-			<version>3.9.0</version>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-json-jackson</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.sdc.sdc-tosca</groupId>
+			<artifactId>sdc-tosca</artifactId>
+			<version>1.4.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.sdc.jtosca</groupId>
+			<artifactId>jtosca</artifactId>
+			<version>1.4.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>uk.co.blackpepper.bowman</groupId>
+			<artifactId>bowman-client</artifactId>
+			<version>0.3.0</version>
+		</dependency>
 		<dependency>
 			<groupId>pl.pragmatists</groupId>
 			<artifactId>JUnitParams</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-core</artifactId>
-			<version>3.9.0</version>
+			<groupId>ch.vorburger.mariaDB4j</groupId>
+			<artifactId>mariaDB4j</artifactId>
+			<version>2.2.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>pl.pragmatists</groupId>
-			<artifactId>JUnitParams</artifactId>
-			<version>1.1.1</version>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-wiremock</artifactId>
+			<version>1.2.4.RELEASE</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.9.0</version>
+			<version>3.11.1</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>pl.pragmatists</groupId>
-			<artifactId>JUnitParams</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-   <dependency>
-        <groupId>org.jboss.resteasy</groupId>
-        <artifactId>resteasy-jackson2-provider</artifactId>
-        <version>3.1.0.Final</version>
-    </dependency>
 	</dependencies>
 </project>