Merge 'origin/casablanca' into master

[so.git] / bpmn / mso-infrastructure-bpmn / pom.xml

diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml
index e617cfe..5d0d05d 100644 (file)
--- a/bpmn/mso-infrastructure-bpmn/pom.xml
+++ b/bpmn/mso-infrastructure-bpmn/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.onap.so</groupId>
                <artifactId>bpmn</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>mso-infrastructure-bpmn</artifactId>
@@ -20,6 +20,7 @@
                                                        <goal>unpack</goal>
                                                </goals>
                                                <configuration>
+                                                       <skip>true</skip>
                                                        <artifactItems>
                                                                <artifactItem>
                                                                        <groupId>org.onap.so</groupId>
@@ -53,6 +54,24 @@
                                        </execution>
                                </executions>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>integration-test</id>
+                                               <goals>
+                                                       <goal>test</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <skip>true</skip>
+                                                       <includes>
+                                                               <include>**/IntegrationTestSuite.java</include>
+                                                       </includes>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-compiler-plugin</artifactId>
@@ -132,12 +151,17 @@
                <dependency>
                        <groupId>org.camunda.bpm.springboot</groupId>
                        <artifactId>camunda-bpm-spring-boot-starter</artifactId>
-                       <version>2.3.0</version>
+                       <version>${camunda.springboot.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.camunda.bpm.springboot</groupId>
+                       <artifactId>camunda-bpm-spring-boot-starter-webapp</artifactId>
+                       <version>${camunda.springboot.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.camunda.bpm.springboot</groupId>
                        <artifactId>camunda-bpm-spring-boot-starter-rest</artifactId>
-                       <version>2.3.0</version>
+                       <version>${camunda.springboot.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.camunda.bpm.springboot</groupId>
@@ -175,6 +199,16 @@
                        <type>test-jar</type>
                        <scope>test</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.onap.so</groupId>
+                       <artifactId>so-bpmn-building-blocks</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.so</groupId>
+                       <artifactId>so-bpmn-infrastructure-flows</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
                <dependency>
                        <groupId>com.h2database</groupId>
                        <artifactId>h2</artifactId>
@@ -193,13 +227,11 @@
                </dependency>
                <dependency>
                        <groupId>io.micrometer</groupId>
-                       <artifactId>micrometer-spring-legacy</artifactId>
-                       <version>1.0.5</version>
+                       <artifactId>micrometer-core</artifactId>
                </dependency>
                <dependency>
                        <groupId>io.micrometer</groupId>
-                       <artifactId>micrometer-registry-prometheus</artifactId>
-                       <version>1.0.5</version>
+                       <artifactId>micrometer-registry-prometheus</artifactId>                 
                </dependency>
                <dependency>
                        <groupId>org.onap.so</groupId>
@@ -211,5 +243,23 @@
                        <artifactId>cxf-logging</artifactId>
                        <version>${project.version}</version>
                </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.bpm.extension</groupId>
+                       <artifactId>camunda-bpm-assert</artifactId>
+                       <version>2.0-alpha2</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.assertj</groupId>
+                       <artifactId>assertj-core</artifactId>
+                       <version>1.7.0</version>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
 </project>