This is an automated email from the git hooks/post-receive script. New change to branch feature/657_update_to_flyway_5 in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git at cf32b452 Passes use of deprecated configuration directive from warn to error This branch includes the following new commits: new 26755305 Using flyway 5.0.0 new 9e1a38ff Remove pointless modifiers in flyway module new cf32b452 Passes use of deprecated configuration directive from warn to error The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9e1a38ffb76180243a132ef22c44519c899b6c84 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Jan 8 15:25:21 2018 +0100 Remove pointless modifiers in flyway module commit cf32b4522a52fb5db7667f4156e80ac40cf69013 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Jan 8 15:26:03 2018 +0100 Passes use of deprecated configuration directive from warn to error commit 267553053e790d366b6d04991cd3adb309a72aa6 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Jan 8 15:10:35 2018 +0100 Using flyway 5.0.0 https://gitlab.nuiton.org/nuiton/topia/issues/657 -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/657_update_to_flyway_5 in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 267553053e790d366b6d04991cd3adb309a72aa6 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Jan 8 15:10:35 2018 +0100 Using flyway 5.0.0 https://gitlab.nuiton.org/nuiton/topia/issues/657 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index daae8355..fcac91de 100644 --- a/pom.xml +++ b/pom.xml @@ -220,7 +220,7 @@ <!-- libs version --> <commonsLoggingVersion>1.2</commonsLoggingVersion> <eugeneVersion>3.0-alpha-10</eugeneVersion> - <flywayVersion>4.2.0</flywayVersion> + <flywayVersion>5.0.0</flywayVersion> <guavaVersion>23.0</guavaVersion> <!-- Do not upgrade H2 to 1.4 see #3691 --> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/657_update_to_flyway_5 in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 9e1a38ffb76180243a132ef22c44519c899b6c84 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Jan 8 15:25:21 2018 +0100 Remove pointless modifiers in flyway module --- .../src/main/java/org/nuiton/topia/flyway/TopiaFlywayService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayService.java b/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayService.java index 6173cf73..a6879442 100644 --- a/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayService.java +++ b/topia-service-flyway/src/main/java/org/nuiton/topia/flyway/TopiaFlywayService.java @@ -37,19 +37,19 @@ public interface TopiaFlywayService extends TopiaMigrationService { * @deprecated use {@link #FLYWAY_BASELINE_VERSION} */ @Deprecated - public static final String FLYWAY_INIT_VERSION = "flyway.initVersion"; + String FLYWAY_INIT_VERSION = "flyway.initVersion"; /** * If you want flyway to init with an already existing DB, you must use * this configuration and give, as value the version of the already * existing schema. */ - public static final String FLYWAY_BASELINE_VERSION = "flyway.baselineVersion"; + String FLYWAY_BASELINE_VERSION = "flyway.baselineVersion"; /** * Tells ToPIA to set (or not) the Flyway's target version from the model version. Expected values are "true" or * "false". The default one is "true". */ - public static final String USE_MODEL_VERSION = "useModelVersion"; + String USE_MODEL_VERSION = "useModelVersion"; } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/657_update_to_flyway_5 in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit cf32b4522a52fb5db7667f4156e80ac40cf69013 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Jan 8 15:26:03 2018 +0100 Passes use of deprecated configuration directive from warn to error --- .../nuiton/topia/flyway/TopiaFlywayServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 a0c268b3..dab436eb 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 @@ -40,6 +40,7 @@ import org.flywaydb.core.internal.util.Location; import org.nuiton.topia.persistence.TopiaApplicationContext; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaMigrationServiceException; +import org.nuiton.topia.persistence.TopiaMisconfigurationException; import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; import java.io.IOException; @@ -77,6 +78,13 @@ public class TopiaFlywayServiceImpl implements TopiaFlywayService { @Override public void initTopiaService(TopiaApplicationContext topiaApplicationContext, Map<String, String> serviceConfiguration) { + if (serviceConfiguration.containsKey(FLYWAY_INIT_VERSION)) { + if (log.isErrorEnabled()) { + log.error(FLYWAY_INIT_VERSION + " is deprecated, use " + FLYWAY_BASELINE_VERSION + " instead"); + } + throw new TopiaMisconfigurationException(FLYWAY_INIT_VERSION + " is deprecated, use " + FLYWAY_BASELINE_VERSION + " instead", topiaApplicationContext.getConfiguration()); + } + modelVersion = topiaApplicationContext.getModelVersion(); // set flywayBaselineVersion if provided @@ -85,14 +93,6 @@ public class TopiaFlywayServiceImpl implements TopiaFlywayService { if (StringUtils.isBlank(flywayBaselineVersion)) { throw new IllegalArgumentException("'" + FLYWAY_BASELINE_VERSION + "' must not be empty"); } - } else if (serviceConfiguration.containsKey(FLYWAY_INIT_VERSION)) { - if (log.isWarnEnabled()) { - log.warn(FLYWAY_INIT_VERSION + " is deprecated, use " + FLYWAY_BASELINE_VERSION + " instead"); - } - flywayBaselineVersion = serviceConfiguration.get(FLYWAY_INIT_VERSION); - if (StringUtils.isBlank(flywayBaselineVersion)) { - throw new IllegalArgumentException("'" + FLYWAY_INIT_VERSION + "' must not be empty"); - } } // set useModelVersion if provided @@ -207,7 +207,7 @@ public class TopiaFlywayServiceImpl implements TopiaFlywayService { // Use model version, flywayInitVersion should not be specified Preconditions.checkState(Strings.isNullOrEmpty(flywayBaselineVersion), - FLYWAY_INIT_VERSION + " is not not compatible with " + USE_MODEL_VERSION + "=true"); + FLYWAY_BASELINE_VERSION + " is not not compatible with " + USE_MODEL_VERSION + "=true"); if (log.isInfoEnabled()) { log.info("Using model version: " + modelVersion); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm