Updated Flyway configuration.
Change-Id: Id32ef35f47bc190220688086c50be2a7a36a88c4
diff --git a/lite/src/main/resources/lite-config.xml b/lite/src/main/resources/lite-config.xml
index 637977f..def33a2 100644
--- a/lite/src/main/resources/lite-config.xml
+++ b/lite/src/main/resources/lite-config.xml
@@ -71,14 +71,18 @@
<!--<property name="initialSize" value="2"/> -->
<!--<property name="poolPreparedStatements" value="true"/> -->
</bean>
-
- <bean id="flyway" class="org.flywaydb.core.Flyway" init-method="migrate">
+ <bean id="flywayConfig" class="org.flywaydb.core.api.configuration.ClassicConfiguration">
<property name="baselineOnMigrate" value="true" />
<!-- <property name="validateOnMigrate" value="false" /> -->
<!-- <property name="cleanOnValidationError" value="true" /> -->
- <property name="locations" value="${jdbc.schemaPath}" />
+ <property name="locations" value="#{'${jdbc.schemaPath}'.split(',')}"/>
<property name="dataSource" ref="sqliteDataSource" />
</bean>
+
+ <bean id="flyway" class="org.flywaydb.core.Flyway" init-method="migrate">
+ <constructor-arg ref="flywayConfig"/>
+ </bean>
+
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
diff --git a/lite/src/test/resources/test-config.xml b/lite/src/test/resources/test-config.xml
index 952d5d1..a68d8b1 100644
--- a/lite/src/test/resources/test-config.xml
+++ b/lite/src/test/resources/test-config.xml
@@ -70,13 +70,17 @@
</property>
</bean>
- <bean id="flyway" class="org.flywaydb.core.Flyway" init-method="migrate">
- <property name="baselineOnMigrate" value="true" />
+ <bean id="flywayConfig" class="org.flywaydb.core.api.configuration.ClassicConfiguration">
+ <property name="baselineOnMigrate" value="true" />
<!-- <property name="validateOnMigrate" value="false" /> -->
<!-- <property name="cleanOnValidationError" value="true" /> -->
- <property name="locations" value="${jdbc.schemaPath}" />
+ <property name="locations" value="#{'${jdbc.schemaPath}'.split(',')}"/>
<property name="dataSource" ref="sqliteDataSource" />
</bean>
+
+ <bean id="flyway" class="org.flywaydb.core.Flyway" init-method="migrate">
+ <constructor-arg ref="flywayConfig"/>
+ </bean>
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">