| commit | df63fb21c8379f1b371830fcae0217eb1910155a | [log] [tgz] |
|---|---|---|
| author | Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com> | Thu Feb 21 18:34:56 2019 -0500 |
| committer | Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com> | Thu Feb 21 18:38:42 2019 -0500 |
| tree | 856df24f8677bb7092ed7f95fea6f5495c154ba0 | |
| parent | 7284d2f020cf0daedcb29ed5fd6cfa30cdf2cd8a [diff] |
updated base yamls to properly connect to DB Fix startup of catalog, request, bpmn and openstack Change-Id: I83dcd17d03c71301610ab2c8bbeb30142cc14303 Issue-ID: SO-1558 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml index 5d0d05d..fceb181 100644 --- a/bpmn/mso-infrastructure-bpmn/pom.xml +++ b/bpmn/mso-infrastructure-bpmn/pom.xml
@@ -175,6 +175,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-jpa</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jdbc</artifactId> + </exclusion> + </exclusions> <optional>true</optional> </dependency> <dependency>
diff --git a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml index 829fc12..d3d2c60 100644 --- a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml +++ b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
@@ -8,7 +8,7 @@ spring: datasource: driver-class-name: org.mariadb.jdbc.Driver - jdbc-url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/camundabpmn + url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/camundabpmn username: ${DB_USERNAME} password: ${DB_PASSWORD} http:
diff --git a/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml b/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml index 09ffc0e..56a92cb 100644 --- a/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml +++ b/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml
@@ -157,7 +157,7 @@ headers.latestVersion: 2 spring: datasource: - jdbc-url: jdbc:mariadb://localhost:3307/camundabpmn + url: jdbc:mariadb://localhost:3307/camundabpmn username: root password: password driver-class-name: org.mariadb.jdbc.Driver