This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit b64109194ae58e47a89d08484377f6452597cb9e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:37:39 2016 +0100 Updates flyway to 4.0.3 (Fixes #4085) --- pom.xml | 2 +- .../main/java/org/nuiton/topia/flyway/TopiaFlywayServiceImpl.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0df2d48..abf3654 100644 --- a/pom.xml +++ b/pom.xml @@ -218,7 +218,7 @@ <!-- libs version --> <commonsLoggingVersion>1.2</commonsLoggingVersion> <eugeneVersion>3.0-alpha-9</eugeneVersion> - <flywayVersion>3.1</flywayVersion> + <flywayVersion>4.0.3</flywayVersion> <guavaVersion>20.0</guavaVersion> <!-- Do not upgrade H2 to 1.4 see #3691 --> diff --git a/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayServiceImpl.java b/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayServiceImpl.java index 8c9569d..a0c268b 100644 --- a/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayServiceImpl.java +++ b/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayServiceImpl.java @@ -35,6 +35,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationInfo; +import org.flywaydb.core.api.MigrationVersion; import org.flywaydb.core.internal.util.Location; import org.nuiton.topia.persistence.TopiaApplicationContext; import org.nuiton.topia.persistence.TopiaException; @@ -253,7 +254,7 @@ public class TopiaFlywayServiceImpl implements TopiaFlywayService { log.info("baseline flyway to version " + baselineVersion); } - flyway.setBaselineVersion(baselineVersion); + flyway.setBaselineVersion(MigrationVersion.fromVersion(baselineVersion)); flyway.setBaselineDescription("schema creation called on application context by topia flyway service"); flyway.baseline(); @@ -279,7 +280,7 @@ public class TopiaFlywayServiceImpl implements TopiaFlywayService { log.debug("schema exists, will ask flyway to init if necessary to version " + flywayBaselineVersion); } flyway.setBaselineOnMigrate(true); - flyway.setBaselineVersion(flywayBaselineVersion); + flyway.setBaselineVersion(MigrationVersion.fromVersion(flywayBaselineVersion)); } if (useModelVersion) { @@ -289,7 +290,7 @@ public class TopiaFlywayServiceImpl implements TopiaFlywayService { log.info("schema exists, will run flyway migration up to target version " + targetVersion); } - flyway.setTarget(targetVersion); + flyway.setTarget(MigrationVersion.fromVersion(targetVersion)); } else { if (log.isInfoEnabled()) { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.