Merge "update camunda and spring to latest versions"

1 files changed, 5 insertions, 53 deletions

diff --git a/bpmn/so-bpmn-infrastructure-flows/pom.xml b/bpmn/so-bpmn-infrastructure-flows/pom.xml
index 43d8b89fe8..fa45a415ee 100644
--- a/bpmn/so-bpmn-infrastructure-flows/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-flows/pom.xml
@@ -14,7 +14,6 @@
     <camunda.bpm.assert.version>2.0-alpha2</camunda.bpm.assert.version>
     <assertj.core.version>1.7.0</assertj.core.version>
     <grpc.version>1.17.1</grpc.version>
-    <camunda.mockito.version>3.2.1</camunda.mockito.version>
   </properties>
 
   <build>
@@ -54,15 +53,9 @@
               <pluginExecutions>
                 <pluginExecution>
                   <pluginExecutionFilter>
-                    <groupId>
-											org.apache.maven.plugins
-										</groupId>
-                    <artifactId>
-											maven-antrun-plugin
-										</artifactId>
-                    <versionRange>
-											[1.3,)
-										</versionRange>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <versionRange>[1.3,)</versionRange>
                     <goals>
                       <goal>run</goal>
                     </goals>
@@ -145,7 +138,6 @@
     </pluginManagement>
     <finalName>${project.artifactId}-${project.version}</finalName>
   </build>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -157,24 +149,20 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-
   <dependencies>
     <dependency>
       <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.springboot</groupId>
       <artifactId>camunda-bpm-spring-boot-starter-webapp</artifactId>
-      <version>${camunda.springboot.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.camunda.bpm.extension.mockito</groupId>
       <artifactId>camunda-bpm-mockito</artifactId>
-      <version>${camunda.mockito.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -213,6 +201,7 @@
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
       <version>1.10.19</version>
+      <!-- remove -->
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -220,15 +209,6 @@
       <artifactId>java-uuid-generator</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so</groupId>
-      <artifactId>MSOCoreBPMN</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.onap.so</groupId>
       <artifactId>MSOCoreBPMN</artifactId>
       <version>${project.version}</version>
@@ -254,11 +234,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>javax.ws.rs-api</artifactId>
-      <version>${jax.ws.rs}</version>
-    </dependency>
-    <dependency>
       <groupId>org.camunda.spin</groupId>
       <artifactId>camunda-spin-core</artifactId>
       <scope>test</scope>
@@ -277,7 +252,6 @@
       <groupId>org.camunda.bpm</groupId>
       <artifactId>camunda-engine-plugin-spin</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.camunda.bpm</groupId>
       <artifactId>camunda-engine-plugin-connect</artifactId>
@@ -296,35 +270,14 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-      <version>1.3</version>
-    </dependency>
-    <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-configuration-processor</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mariadb.jdbc</groupId>
-      <artifactId>mariadb-java-client</artifactId>
-    </dependency>
-    <dependency>
       <groupId>ch.vorburger.mariaDB4j</groupId>
       <artifactId>mariaDB4j</artifactId>
-      <version>2.2.3</version>
+      <version>2.3.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -333,6 +286,5 @@
       <version>${grpc.version}</version>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 </project>