diff options
| author |   Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com> | 2019-02-26 15:59:30 -0500 |
|---|---|---|
| committer | Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com> | 2019-02-26 16:57:49 -0500 |
| commit | a083e7066c8eaf17de2d322751c98e6e30419947 (patch) | |
| tree | f3c8859a62fc7f34e5b014c2aa5a148a7129f459 | |
| parent | d42583c1fa3fabd7e4615d66593560469a652213 (diff) | |
removed flyway from bpmn base yaml
Fix startup of catalog, request, bpmn and openstack
Change-Id: I8e8222e410da58a62beed8cb184c90ebe73aea6c
Issue-ID: SO-1558
Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
5 files changed, 15 insertions, 10 deletions
diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml index 390c775cb2..dbfc5b7f6b 100644 --- a/adapters/mso-catalog-db-adapter/pom.xml +++ b/adapters/mso-catalog-db-adapter/pom.xml @@ -153,6 +153,10 @@ </dependency> <dependency> <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-jdbc</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> </dependency> diff --git a/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml b/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml index a842c1d56b..09262f9f58 100644 --- a/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml +++ b/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml @@ -14,7 +14,7 @@ mso: spring: datasource: - jdbcUrl: jdbc:mariadb://localhost:3307/catalogdb + url: jdbc:mariadb://localhost:3307/catalogdb username: root password: password driver-class-name: org.mariadb.jdbc.Driver diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml index 46e73246a0..12aee67a74 100644 --- a/adapters/mso-openstack-adapters/pom.xml +++ b/adapters/mso-openstack-adapters/pom.xml @@ -188,6 +188,10 @@ </exclusions> </dependency> <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-jdbc</artifactId> + </dependency> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-spring-boot-starter-jaxws</artifactId> <version>${cxf.version}</version> diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml index fceb1812ba..6f0b1f6fc9 100644 --- a/bpmn/mso-infrastructure-bpmn/pom.xml +++ b/bpmn/mso-infrastructure-bpmn/pom.xml @@ -185,6 +185,10 @@ </dependency> <dependency> <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-jdbc</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> </dependency> diff --git a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml index ee75ffa17d..18b94e725a 100644 --- a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml +++ b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml @@ -9,15 +9,8 @@ spring: datasource: driver-class-name: org.mariadb.jdbc.Driver jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/camundabpmn - username: ${DB_USERNAME} - password: ${DB_PASSWORD} - flyway: - baselineOnMigrate: true - outOfOrder: true - table: FLYWAY_SCHEMA_HISTORY - url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/camundabpmn - user: ${DB_ADMIN_USERNAME} - password: ${DB_ADMIN_PASSWORD} + username: ${DB_ADMIN_USERNAME} + password: ${DB_ADMIN_PASSWORD} http: multipart: enabled: false |