diff options
| author |   Dan Timoney <dt5972@att.com> | 2018-09-17 18:08:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-17 18:08:13 +0000 |
| commit | 2078fe6d59ca21565694b694326d8c1e8d4f9454 (patch) | |
| tree | d65d4be66eaa94209fc51fed8a76c74e6b744bfa | |
| parent | 9783a8b7515eaaec310e404650d0dd9092eb90a8 (diff) | |
| parent | ed66bb6ffc5d57022b2f18ed563d01b72ecef341 (diff) | |
Merge "Controller Blueprints Microservice"
| -rw-r--r-- | components/parent/pom.xml | 4 | ||||
| -rw-r--r-- | ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml | 4 | ||||
| -rw-r--r-- | ms/controllerblueprints/parent/pom.xml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/components/parent/pom.xml b/components/parent/pom.xml index cbbeeffc..abd979b0 100644 --- a/components/parent/pom.xml +++ b/components/parent/pom.xml @@ -28,9 +28,9 @@ <name>App Components 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> <guava.version>26.0-jre</guava.version> <springfox.swagger2.version>2.9.2</springfox.swagger2.version> diff --git a/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml b/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml index 493d4381..3c146469 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 8b719f57..aabb4b25 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> |