From d16d510f33a1ec19732e660f7577aabef10da17d Mon Sep 17 00:00:00 2001
From: Brinda Santh <brindasanth@in.ibm.com>
Date: Mon, 10 Sep 2018 23:15:31 -0400
Subject: Controller Blueprints Microservice

Changes to MariaDB from MySql in Pom.xml

Issue-ID: CCSDK-532
Change-Id: I6b231f503448a3a0134da8cfc360989b60a9b2b2
Signed-off-by: Dilip kumar Pampana <dilip.kumar.pampana@ibm.com>
---
 .../application/opt/app/onap/config/application.properties  |  4 ++--
 ms/controllerblueprints/modules/service/pom.xml             | 13 ++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'ms/controllerblueprints')

diff --git a/ms/controllerblueprints/application/opt/app/onap/config/application.properties b/ms/controllerblueprints/application/opt/app/onap/config/application.properties
index 2d355d653..b65d5bfe5 100644
--- a/ms/controllerblueprints/application/opt/app/onap/config/application.properties
+++ b/ms/controllerblueprints/application/opt/app/onap/config/application.properties
@@ -40,11 +40,11 @@ spring.jpa.properties.hibernate.format_sql=true
 spring.datasource.url=jdbc:mysql://localhost:3306/sdnctl
 spring.datasource.username=sdnctl
 spring.datasource.password=sdnctl
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
 spring.jpa.show-sql = true
 spring.jpa.hibernate.ddl-auto = none
 spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 
 #Load Blueprints
 # blueprints.load.initial-data may be overridden by ENV variables
diff --git a/ms/controllerblueprints/modules/service/pom.xml b/ms/controllerblueprints/modules/service/pom.xml
index 9efadd189..524e0ebed 100644
--- a/ms/controllerblueprints/modules/service/pom.xml
+++ b/ms/controllerblueprints/modules/service/pom.xml
@@ -54,20 +54,15 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <!--<dependency>-->
-        <!--<groupId>org.mariadb.jdbc</groupId>-->
-        <!--<artifactId>mariadb-java-client</artifactId>-->
-        <!--</dependency>-->
-
+        <dependency>
+        <groupId>org.mariadb.jdbc</groupId>
+        <artifactId>mariadb-java-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito2</artifactId>
-- 
cgit 1.2.3-korg