Merge "update camunda and spring to latest versions"

1 files changed, 7 insertions, 35 deletions

diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml
index 459c8e2d56..e975425852 100644
--- a/adapters/mso-openstack-adapters/pom.xml
+++ b/adapters/mso-openstack-adapters/pom.xml
@@ -15,7 +15,6 @@
   </properties>
   <build>
     <finalName>${project.artifactId}-${project.version}</finalName>
-
     <plugins>
       <plugin>
         <groupId>org.springframework.boot</groupId>
@@ -26,9 +25,7 @@
         <executions>
           <execution>
             <goals>
-              <goal>
-								repackage
-							</goal>
+              <goal>repackage</goal>
             </goals>
           </execution>
         </executions>
@@ -87,8 +84,6 @@
         </executions>
       </plugin>
     </plugins>
-
-
     <pluginManagement>
       <plugins>
         <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build 
@@ -140,17 +135,7 @@
       </plugins>
     </pluginManagement>
   </build>
-
   <dependencies>
-    <!-- added for spring boot support -->
-    <dependency>
-      <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>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -177,14 +162,6 @@
       <artifactId>janino</artifactId>
       <version>2.5.15</version>
     </dependency>
-
-    <!-- end added for spring boot support -->
-
-    <dependency>
-      <groupId>org.pacesys</groupId>
-      <artifactId>openstack4j-core</artifactId>
-      <version>3.2.0</version>
-    </dependency>
     <dependency>
       <groupId>org.pacesys.openstack4j.connectors</groupId>
       <artifactId>openstack4j-jersey2</artifactId>
@@ -210,7 +187,6 @@
       <artifactId>commons-collections</artifactId>
       <version>3.2.2</version>
     </dependency>
-
     <dependency>
       <groupId>com.typesafe</groupId>
       <artifactId>config</artifactId>
@@ -221,14 +197,11 @@
       <artifactId>jsr305</artifactId>
       <version>1.3.9</version>
     </dependency>
-
     <dependency>
       <groupId>commons-validator</groupId>
       <artifactId>commons-validator</artifactId>
       <version>1.4.1</version>
     </dependency>
-
-    <!-- added for unit testing -->
     <dependency>
       <groupId>org.onap.so.adapters</groupId>
       <artifactId>mso-adapter-utils</artifactId>
@@ -249,14 +222,9 @@
       <artifactId>mariadb-java-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.onap.so</groupId>
-      <artifactId>common</artifactId>
-      <version>${project.version}</version>
-    </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>
@@ -278,12 +246,16 @@
     <dependency>
       <groupId>org.camunda.bpm</groupId>
       <artifactId>camunda-external-task-client</artifactId>
-      <version>1.1.1</version>
+      <version>1.4.0</version>
     </dependency>
     <dependency>
       <groupId>com.github.seancfoley</groupId>
       <artifactId>ipaddress</artifactId>
       <version>2.0.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-validation</artifactId>
+    </dependency>
   </dependencies>
 </project>