From 41c2f1da66124c013f1fe644e2220b078fbf2563 Mon Sep 17 00:00:00 2001
From: "Muthuramalingam, Brinda Santh(bs2796)" <bs2796@att.com>
Date: Fri, 14 Sep 2018 20:07:46 +0000
Subject: Controller Blueprints Microservice

Change database to mariadb in docker compose and spring boot version upgrade

Change-Id: Icd73b8110aea2a1b90ab29217b9c5e30817e6c06
Issue-ID: CCSDK-574
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>
---
 ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml | 4 ++--
 ms/controllerblueprints/parent/pom.xml                               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml b/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
index 493d43813..3c1464699 100644
--- a/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
+++ b/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
@@ -2,8 +2,8 @@ version: '3.3'
 
 services:
    db:
-     image: mysql:5.7.22
-     container_name: cb-mysql
+     image: mariadb:latest
+     container_name: cb-mariadb
      ports:
        - "3307:3306"
      volumes:
diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml
index 8b719f577..aabb4b259 100644
--- a/ms/controllerblueprints/parent/pom.xml
+++ b/ms/controllerblueprints/parent/pom.xml
@@ -28,9 +28,9 @@
     <name>Controller Blueprints Parent</name>
     <packaging>pom</packaging>
     <properties>
-        <spring.boot.version>2.0.4.RELEASE</spring.boot.version>
+        <spring.boot.version>2.0.5.RELEASE</spring.boot.version>
         <spring.version>5.0.8.RELEASE</spring.version>
-        <kotlin.version>1.2.60</kotlin.version>
+        <kotlin.version>1.2.70</kotlin.version>
         <eelf.version>1.0.0</eelf.version>
         <springfox.swagger2.version>2.9.2</springfox.swagger2.version>
         <h2database.version>1.4.197</h2database.version>
-- 
cgit 1.2.3-korg