From 7143ac416a61ff865c86001d0357259748b48b85 Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@us.att.com>
Date: Wed, 27 Feb 2019 10:11:44 -0500
Subject: Fix start up

corrected application properties

Issue-ID: SO-1558
Change-Id: Ib768d7c72a64a11dbb08eea79c4c9a4f5fb970a6
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 adapters/mso-catalog-db-adapter/pom.xml                    |  4 ----
 .../src/main/resources/application-local.yaml              | 14 +-------------
 .../src/main/resources/application.yaml                    |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)

(limited to 'adapters/mso-catalog-db-adapter')

diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml
index dbfc5b7f6b..390c775cb2 100644
--- a/adapters/mso-catalog-db-adapter/pom.xml
+++ b/adapters/mso-catalog-db-adapter/pom.xml
@@ -151,10 +151,6 @@
 		         </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/main/resources/application-local.yaml b/adapters/mso-catalog-db-adapter/src/main/resources/application-local.yaml
index 078e22b8ee..d7c13eaa14 100644
--- a/adapters/mso-catalog-db-adapter/src/main/resources/application-local.yaml
+++ b/adapters/mso-catalog-db-adapter/src/main/resources/application-local.yaml
@@ -13,15 +13,7 @@ mso:
         endpoint: http://localhost:8090
   db:
     auth: Basic YnBlbDptc28tZGItMTUwNyE=
-
 spring:
-  datasource:
-    jdbc-url: jdbc:mariadb://localhost:3306/catalogdb
-    username: catalog
-    password: catalog123
-    driver-class-name: org.mariadb.jdbc.Driver
-    initialization-mode: never
-
   security:
     usercredentials:
     -  
@@ -40,8 +32,4 @@ spring:
 server:
     port: 8090
 
-flyway:
-  baseline-on-migrate: false
-  jdbc-url: jdbc:mariadb://localhost:3306/catalogdb
-  user: catalog
-  password: catalog123
+
diff --git a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
index 0977bf95fb..aa9317c920 100644
--- a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
@@ -16,7 +16,7 @@ mso:
     
 spring:
   datasource:
-    jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
+    url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
     driver-class-name: org.mariadb.jdbc.Driver
-- 
cgit 1.2.3-korg