changed to jdbcUrl and updated flyway for bpmn

Fix startup of catalog, request, bpmn and openstack

Change-Id: I5982857c610ae46aa8690764c4f6ef99240f5088
Issue-ID: SO-1558
Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
diff --git a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
index d3d2c60..ee75ffa 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
+++ b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
@@ -8,9 +8,16 @@
 spring: 
   datasource:
      driver-class-name: org.mariadb.jdbc.Driver 
-     url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/camundabpmn
+     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}
   http:
     multipart:
       enabled: false
diff --git a/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml b/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml
index 56a92cb..21ad485 100644
--- a/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml
+++ b/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml
@@ -157,7 +157,7 @@
     headers.latestVersion: 2
 spring:
   datasource:
-    url: jdbc:mariadb://localhost:3307/camundabpmn
+    jdbcUrl: jdbc:mariadb://localhost:3307/camundabpmn
     username: root
     password: password
     driver-class-name: org.mariadb.jdbc.Driver