From a083e7066c8eaf17de2d322751c98e6e30419947 Mon Sep 17 00:00:00 2001
From: "Kalkere Ramesh, Sharan (sk720x)" <sk720x@att.com>
Date: Tue, 26 Feb 2019 15:59:30 -0500
Subject: removed flyway from bpmn base yaml

Fix startup of catalog, request, bpmn and openstack

Change-Id: I8e8222e410da58a62beed8cb184c90ebe73aea6c
Issue-ID: SO-1558
Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
---
 adapters/mso-catalog-db-adapter/pom.xml                       |  4 ++++
 .../src/test/resources/application-test.yaml                  |  2 +-
 adapters/mso-openstack-adapters/pom.xml                       |  4 ++++
 bpmn/mso-infrastructure-bpmn/pom.xml                          |  4 ++++
 .../src/main/resources/application.yaml                       | 11 ++---------
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml
index 390c775cb2..dbfc5b7f6b 100644
--- a/adapters/mso-catalog-db-adapter/pom.xml
+++ b/adapters/mso-catalog-db-adapter/pom.xml
@@ -151,6 +151,10 @@
 		         </exclusion>
      		</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>			
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml b/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml
index a842c1d56b..09262f9f58 100644
--- a/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml
+++ b/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml
@@ -14,7 +14,7 @@ mso:
 
 spring:
   datasource:
-    jdbcUrl: jdbc:mariadb://localhost:3307/catalogdb
+    url: jdbc:mariadb://localhost:3307/catalogdb
     username: root
     password: password
     driver-class-name: org.mariadb.jdbc.Driver
diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml
index 46e73246a0..12aee67a74 100644
--- a/adapters/mso-openstack-adapters/pom.xml
+++ b/adapters/mso-openstack-adapters/pom.xml
@@ -187,6 +187,10 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>			
+		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml
index fceb1812ba..6f0b1f6fc9 100644
--- a/bpmn/mso-infrastructure-bpmn/pom.xml
+++ b/bpmn/mso-infrastructure-bpmn/pom.xml
@@ -183,6 +183,10 @@
      		</exclusions>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>			
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
index ee75ffa17d..18b94e725a 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
+++ b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
@@ -9,15 +9,8 @@ spring:
   datasource:
      driver-class-name: org.mariadb.jdbc.Driver 
      jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/camundabpmn
-     username: ${DB_USERNAME}
-     password: ${DB_PASSWORD}
-  flyway:
-    baselineOnMigrate: true
-    outOfOrder: true
-    table: FLYWAY_SCHEMA_HISTORY
-    url:  jdbc:mariadb://${DB_HOST}:${DB_PORT}/camundabpmn
-    user: ${DB_ADMIN_USERNAME}
-    password: ${DB_ADMIN_PASSWORD}
+     username: ${DB_ADMIN_USERNAME}
+     password: ${DB_ADMIN_PASSWORD}
   http:
     multipart:
       enabled: false
-- 
cgit 1.2.3-korg