Merge "Config Assign"

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

diff --git a/bpmn/so-bpmn-infrastructure-common/pom.xml b/bpmn/so-bpmn-infrastructure-common/pom.xml
index ad51b3f..9ba278a 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-common/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-common/pom.xml
@@ -3,14 +3,11 @@
        <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>so-bpmn-infrastructure-common</artifactId>
        <packaging>jar</packaging>
-       <properties>
-               <camunda.version>7.8.0</camunda.version>
-       </properties>
        <build>
                <plugins>
                        <plugin>
@@ -82,7 +79,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>
@@ -123,10 +120,10 @@
                                                        <goals>
                                                                <goal>test</goal>
                                                        </goals>
-                                                       <configuration>                                                         
+                                                       <configuration>
                                     <includes>
-                                        <include>**/AllTestsTestSuite.java</include>                                       
-                                    </includes>                              
+                                        <include>**/AllTestsTestSuite.java</include>
+                                    </includes>
                                                        </configuration>
                                                </execution>
                                                <execution>
@@ -134,10 +131,10 @@
                                                        <goals>
                                                                <goal>test</goal>
                                                        </goals>
-                                                       <configuration>                                                         
+                                                       <configuration>
                                     <includes>
-                                        <include>**/AllTasksTestsTestSuite.java</include>                                       
-                                    </includes>                              
+                                        <include>**/AllTasksTestsTestSuite.java</include>
+                                    </includes>
                                                        </configuration>
                                                </execution>
                                        </executions>
@@ -163,18 +160,14 @@
                <dependency>
                        <groupId>org.camunda.bpm.springboot</groupId>
                        <artifactId>camunda-bpm-spring-boot-starter</artifactId>
-                       <version>2.3.0</version>
+                       <version>${camunda.springboot.version}</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-web</artifactId>
+                       <groupId>org.camunda.bpm.springboot</groupId>
+                       <artifactId>camunda-bpm-spring-boot-starter-webapp</artifactId>
+                       <version>${camunda.springboot.version}</version>
                        <scope>test</scope>
-               </dependency>           
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-data-jpa</artifactId>
-                       <optional>true</optional>
                </dependency>
                <dependency>
                        <groupId>org.apache.cxf</groupId>
@@ -190,7 +183,7 @@
                        <groupId>org.apache.cxf</groupId>
                        <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
                        <version>${cxf.version}</version>
-               </dependency>   
+               </dependency>
                <dependency>
                        <groupId>com.h2database</groupId>
                        <artifactId>h2</artifactId>
@@ -199,8 +192,7 @@
                <dependency>
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
-
-               </dependency>   
+               </dependency>
                <dependency>
                        <groupId>com.fasterxml.uuid</groupId>
                        <artifactId>java-uuid-generator</artifactId>
@@ -212,7 +204,6 @@
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-lang3</artifactId>
-                       <version>3.4</version>
                </dependency>
                <dependency>
                        <groupId>org.onap.so</groupId>
@@ -236,11 +227,6 @@
                        <artifactId>javax.ws.rs-api</artifactId>
                        <version>${jax.ws.rs}</version>
                </dependency>
-               <dependency>
-               <groupId>org.onap.so</groupId>
-                       <artifactId>MSORESTClient</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
                <dependency>
                        <groupId>org.camunda.spin</groupId>
                        <artifactId>camunda-spin-core</artifactId>
@@ -269,12 +255,11 @@
                <dependency>
                        <groupId>javax.annotation</groupId>
                        <artifactId>javax.annotation-api</artifactId>
-                       <version>1.3</version>
                </dependency>
                  <dependency>
             <groupId>org.onap.msb.java-sdk</groupId>
             <artifactId>msb-java-sdk</artifactId>
-            <version>1.0.0</version>
+            <version>1.1.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.eclipsesource.jaxrs</groupId>
@@ -299,7 +284,7 @@
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
-               </dependency>   
+               </dependency>
                <dependency>
                        <groupId>org.mariadb.jdbc</groupId>
                        <artifactId>mariadb-java-client</artifactId>
@@ -320,8 +305,17 @@
         <dependency>
             <groupId>org.camunda.bpm.springboot</groupId>
             <artifactId>camunda-bpm-spring-boot-starter-test</artifactId>
-            <version>2.3.0</version>
+            <version>${camunda.springboot.version}</version>
             <scope>test</scope>
         </dependency>
+               <dependency>
+                       <groupId>org.assertj</groupId>
+                       <artifactId>assertj-core</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.camunda.bpm.extension.mockito</groupId>
+                       <artifactId>camunda-bpm-mockito</artifactId>
+               </dependency>
        </dependencies>
 </project>