summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dt5972@att.com>2018-09-17 18:08:13 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-17 18:08:13 +0000
commit18a40583529c4f9125a249e82331365e3ee1ed3c (patch)
tree2ad50d6dd862b98a8d5a5cf760b3bd8c87f63055
parente136000a5011ca71dd88bd81d5dd48d4c16224bc (diff)
parent41c2f1da66124c013f1fe644e2220b078fbf2563 (diff)
Merge "Controller Blueprints Microservice"
-rw-r--r--ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml4
-rw-r--r--ms/controllerblueprints/parent/pom.xml4
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>