diff options
| author |   Jerry Flood <jflood@att.com> | 2019-04-19 07:09:34 -0400 |
|---|---|---|
| committer | Jerry Flood <jflood@att.com> | 2019-04-19 10:07:39 -0400 |
| commit | 9407eccc5c8347c7c92d2f25590d8867213107aa (patch) | |
| tree | cf97b388f99b64bac36e60ac95147fd933380116 /cmso-sonar/docker/integration/cmso-service | |
| parent | ee1816bf02d5f76548b78c46c39537ec8c1d23b0 (diff) | |
Rename classes to avoid duplicates
Copy jacoco exec files for upload to sonar
Handle ending midnight in time window
Issue-ID: OPTFRA-474
Change-Id: Id5df25e404a08e039537e4eb987838835ee12f11
Signed-off-by: Jerry Flood <jflood@att.com>
Diffstat (limited to 'cmso-sonar/docker/integration/cmso-service')
| -rw-r--r-- | cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties | 8 | ||||
| -rw-r--r-- | cmso-sonar/docker/integration/cmso-service/etc/config/liquibase.properties | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties b/cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties index 3602577..ff3dab5 100644 --- a/cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties +++ b/cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties @@ -1,7 +1,7 @@ #------------------------------------------------------------------------------- -# Copyright 2017-2018 AT&T Intellectual Property. -# Modifications Copyright 2018 IBM. +# Copyright ? 2017-2018 AT&T Intellectual Property. +# Modifications Copyright ? 2018 IBM. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ # # # Unless otherwise specified, all documentation contained herein is licensed -# under the Creative Commons License, Attribution 4.0 Intl. (the ??License?); +# under the Creative Commons License, Attribution 4.0 Intl. (the ???License???); # you may not use this documentation except in compliance with the License. # You may obtain a copy of the License at # @@ -32,7 +32,7 @@ ### ### MySQL DB. -spring.datasource.url=jdbc:mariadb://${DB_HOST}:3306/cmso +spring.datasource.url=jdbc:mariadb://${DB_HOST}:${DB_PORT}/cmso spring.datasource.driver-class-name=org.mariadb.jdbc.Driver spring.datasource.username=root spring.datasource.password=beer diff --git a/cmso-sonar/docker/integration/cmso-service/etc/config/liquibase.properties b/cmso-sonar/docker/integration/cmso-service/etc/config/liquibase.properties index b8c850e..05baa58 100644 --- a/cmso-sonar/docker/integration/cmso-service/etc/config/liquibase.properties +++ b/cmso-sonar/docker/integration/cmso-service/etc/config/liquibase.properties @@ -28,7 +28,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ### -spring.datasource.jdbcUrl=jdbc:mariadb://${DB_HOST}:3306/cmso?createDatabaseIfNotExist=true +spring.datasource.jdbcUrl=jdbc:mariadb://${DB_HOST}:${DB_PORT}/cmso?createDatabaseIfNotExist=true spring.datasource.driver-class-name=org.mariadb.jdbc.Driver spring.datasource.username=root spring.datasource.password=beer |