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>

diff --git a/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml b/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
index 493d438..3c14646 100644 (file)
--- 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'
 \r
 services:\r
    db:\r
-     image: mysql:5.7.22\r
-     container_name: cb-mysql\r
+     image: mariadb:latest\r
+     container_name: cb-mariadb\r
      ports:\r
        - "3307:3306"\r
      volumes:\r

diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml
index 8b719f5..aabb4b2 100644 (file)
--- 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>