Merge 'origin/casablanca' into master

[so.git] / bpmn / MSOCommonBPMN / pom.xml

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index 42e9cb6..b115d36 100644 (file)
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -6,20 +6,17 @@
        <parent>
                <groupId>org.onap.so</groupId>
                <artifactId>bpmn</artifactId>
-               <version>1.3.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>
-               <httpclient.version>4.5.5</httpclient.version>
                <maven.compiler.target>1.8</maven.compiler.target>
                <maven.compiler.source>1.8</maven.compiler.source>
        </properties>
 
-
        <build>
                <plugins>
                        <plugin>
@@ -50,6 +47,9 @@
                                                </goals>
                                                <configuration>
                                                        <skip>false</skip>
+                                                       <excludes>
+                                                               <exclude>**/validation/*</exclude>
+                                                       </excludes>
                                                </configuration>
                                        </execution>
                                </executions>
@@ -129,7 +129,7 @@
                                                <configuration>
                                                        <includes>
                                                                <include>**/AllTestSuites.java</include>
-                                                       </includes>     
+                                                       </includes>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -140,7 +140,7 @@
                                                <configuration>
                                                        <includes>
                                                                <include>**/NonSpringSuite.java</include>
-                                                       </includes>     
+                                                       </includes>
                                                </configuration>
                                        </execution>
                                        <execution>
@@ -151,7 +151,7 @@
                                                <configuration>
                                                        <includes>
                                                                <include>**/AllGroovyTestSuites.java</include>
-                                                       </includes>     
+                                                       </includes>
                                                </configuration>
                                        </execution>
                                </executions>
@@ -159,7 +159,7 @@
                </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>
@@ -197,6 +197,7 @@
        <dependencyManagement>
                <dependencies>
                        <dependency>
+                               <!-- Import dependency management from camunda -->
                                <groupId>org.camunda.bpm</groupId>
                                <artifactId>camunda-bom</artifactId>
                                <version>${camunda.version}</version>
@@ -206,14 +207,37 @@
                </dependencies>
        </dependencyManagement>
        <dependencies>
-               <dependency>
-                       <groupId>org.camunda.bpm</groupId>
-                       <artifactId>camunda-engine</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.camunda.bpm.springboot</groupId>
                        <artifactId>camunda-bpm-spring-boot-starter</artifactId>
-                       <version>2.3.0-alpha2</version>
+                       <version>${camunda.springboot.version}</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.cloud</groupId>
+                       <artifactId>spring-cloud-contract-wiremock</artifactId>
+                       <version>1.2.4.RELEASE</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-test</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <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.connect</groupId>
+                       <artifactId>camunda-connect-connectors-all</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>commons-beanutils</groupId>
+                       <artifactId>commons-beanutils</artifactId>
+                       <version>1.9.3</version>
                </dependency>
                <dependency>
                        <groupId>org.springframework.boot</groupId>
@@ -229,10 +253,6 @@
                        <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>
@@ -249,7 +269,7 @@
                </dependency>
                <dependency>
                        <groupId>org.onap.so</groupId>
-                       <artifactId>mso-requests-db</artifactId>                        
+                       <artifactId>mso-requests-db</artifactId>
                        <version>${project.version}</version>
                </dependency>
                <dependency>
@@ -257,11 +277,6 @@
                        <artifactId>common</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>org.onap.so</groupId>
-                       <artifactId>MSORESTClient</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
                <dependency>
                        <groupId>org.onap.so.adapters</groupId>
                        <artifactId>mso-adapters-rest-interface</artifactId>
@@ -273,7 +288,7 @@
                </dependency>
                <dependency>
                        <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpclient</artifactId>             
+                       <artifactId>httpclient</artifactId>
                </dependency>
                <dependency>
                        <groupId>commons-lang</groupId>
@@ -293,27 +308,54 @@
                <dependency>
                        <groupId>org.onap.appc.client</groupId>
                        <artifactId>client-lib</artifactId>
-                       <version>1.4.0</version>
+                       <version>1.4.4</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.4.0</version>
+                       <version>1.4.4</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.mockito</groupId>
+                                       <artifactId>mockito-core</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
-
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>aspectjrt</artifactId>
                </dependency>
-
                <dependency>
                        <groupId>org.json</groupId>
                        <artifactId>json</artifactId>
                </dependency>
+               <dependency>
+                       <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.glassfish.jersey.inject</groupId>
+                       <artifactId>jersey-hk2</artifactId>
+                       <version>2.26</version>
+       </dependency>
                <dependency>
                        <groupId>org.glassfish.jersey.media</groupId>
                        <artifactId>jersey-media-json-jackson</artifactId>
@@ -355,5 +397,11 @@
                        <version>1.2.4.RELEASE</version>
                        <scope>test</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.assertj</groupId>
+                       <artifactId>assertj-core</artifactId>
+                       <version>3.11.1</version>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
 </project>