From d5968f56b382c50dfafc3b6feeccf5b81d176b9d Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@att.com>
Date: Fri, 5 Feb 2021 20:34:11 -0500
Subject: update camunda and spring to latest versions

Updated camunda to 7.14 and updated spring boot camunda to 3.4
Started to clean up duplicate maven dependencies

Issue-ID: SO-3521
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: Ic65b04772b91dd989e41d6b6b93872978bc4e4e2
---
 adapters/mso-sdnc-adapter/pom.xml                  | 35 ++--------------------
 .../src/test/resources/application-test.properties | 13 ++++++++
 2 files changed, 16 insertions(+), 32 deletions(-)

(limited to 'adapters/mso-sdnc-adapter')

diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml
index 590121966e..843f42b1e6 100644
--- a/adapters/mso-sdnc-adapter/pom.xml
+++ b/adapters/mso-sdnc-adapter/pom.xml
@@ -131,32 +131,7 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-
   <dependencies>
-    <dependency>
-      <groupId>com.sun.activation</groupId>
-      <artifactId>javax.activation</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>2.3.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-core</artifactId>
-      <version>2.3.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <version>2.3.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-jersey2-jaxrs</artifactId>
@@ -164,12 +139,12 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-actuator</artifactId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <scope>test</scope>
+      <artifactId>spring-boot-starter-validation</artifactId>
     </dependency>
     <dependency>
       <groupId>org.onap.so.adapters</groupId>
@@ -204,10 +179,6 @@
       <version>1.0.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-registry-prometheus</artifactId>
diff --git a/adapters/mso-sdnc-adapter/src/test/resources/application-test.properties b/adapters/mso-sdnc-adapter/src/test/resources/application-test.properties
index e4f6903e23..0c77e30fe6 100644
--- a/adapters/mso-sdnc-adapter/src/test/resources/application-test.properties
+++ b/adapters/mso-sdnc-adapter/src/test/resources/application-test.properties
@@ -88,6 +88,19 @@ org.onap.so.adapters.sdnc..security-zone-topology-operation.deactivate=POST|2700
 server.port=8080
 server.tomcat.max-threads=50
 ssl-enable: false
+spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
+spring.datasource.url=jdbc:mariadb://localhost:3307/camundabpmn
+spring.datasource.username=root
+spring.datasource.password=password
+spring.datasource.initialization-mode=always
+spring.jpa.generate-ddl=false
+spring.jpa.hibernate.ddl-auto=none
+spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
+spring.jpa.hibernate.enable-lazy-load-no-trans=true
+spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
+mariaDB4j.dataDir=
+mariaDB4j.port=3307
+mariaDB4j.databaseName=camundabpmn
 spring.security.usercredentials[0].username=test
 spring.security.usercredentials[0].password=$2a$12$Zi3AuYcZoZO/gBQyUtST2.F5N6HqcTtaNci2Et.ufsQhski56srIu
 spring.security.usercredentials[0].role=SDNC-Client
-- 
cgit 1.2.3-korg