This is an automated email from the git hooks/post-receive script. New commit to branch refonte-rest in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git commit f1830f1aede42b5a93e102040a3e3eb0cbecd31b Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jun 11 17:35:36 2019 +0200 refs #10392 upgrade topia and hibernate deps --- .../V3_1_0_1__10392_upgrade_hibernate_topia_version.sql | 3 +++ .../java/fr/ifremer/FakeCoselmarApplicationContext.java | 2 +- .../services/FakeCoselmarApplicationContext.java | 2 +- pom.xml | 16 +++++++++++----- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/coselmar-persistence/src/main/resources/db/migration/V3_1_0_1__10392_upgrade_hibernate_topia_version.sql b/coselmar-persistence/src/main/resources/db/migration/V3_1_0_1__10392_upgrade_hibernate_topia_version.sql new file mode 100644 index 0000000..b1dcbb6 --- /dev/null +++ b/coselmar-persistence/src/main/resources/db/migration/V3_1_0_1__10392_upgrade_hibernate_topia_version.sql @@ -0,0 +1,3 @@ + +-- With Hibernate 5.x, liaison table are name by alphabetical table order +ALTER TABLE question_externalexperts RENAME TO externalexperts_question; diff --git a/coselmar-persistence/src/test/java/fr/ifremer/FakeCoselmarApplicationContext.java b/coselmar-persistence/src/test/java/fr/ifremer/FakeCoselmarApplicationContext.java index 63b397e..9d30913 100644 --- a/coselmar-persistence/src/test/java/fr/ifremer/FakeCoselmarApplicationContext.java +++ b/coselmar-persistence/src/test/java/fr/ifremer/FakeCoselmarApplicationContext.java @@ -61,7 +61,7 @@ public class FakeCoselmarApplicationContext extends TestWatcher { protected void starting(Description description) { TopiaConfigurationBuilder topiaConfigurationBuilder = new TopiaConfigurationBuilder(); - topiaConfiguration = topiaConfigurationBuilder.forTestDatabase(description.getTestClass(), description.getMethodName()).onlyCreateSchemaIfDatabaseIsEmpty().doNotValidateSchemaOnStartup().build(); + topiaConfiguration = topiaConfigurationBuilder.forTestDatabase(description.getTestClass(), description.getMethodName()).onlyCreateSchemaIfDatabaseIsEmpty().doNotValidateSchemaOnStartup().useHikariConnectionPool().build(); applicationContext = new CoselmarTopiaApplicationContext(topiaConfiguration); diff --git a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarApplicationContext.java b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarApplicationContext.java index 61124a4..6f20100 100644 --- a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarApplicationContext.java +++ b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarApplicationContext.java @@ -119,7 +119,7 @@ public class FakeCoselmarApplicationContext extends TestWatcher implements Cosel // --- create configuration --- // TopiaConfigurationBuilder topiaConfigurationBuilder = new TopiaConfigurationBuilder(); - Properties defaultvalues = topiaConfigurationBuilder.forTestDatabase(testClass, methodName).onlyCreateSchemaIfDatabaseIsEmpty().doNotValidateSchemaOnStartup().buildProperties(); + Properties defaultvalues = topiaConfigurationBuilder.forTestDatabase(testClass, methodName).onlyCreateSchemaIfDatabaseIsEmpty().doNotValidateSchemaOnStartup().useC3p0ConnectionPool().buildProperties(); defaultvalues.put(CoselmarServicesConfigOption.DATA_DIRECTORY.getKey(), testBasedir.getAbsolutePath()); configuration = new CoselmarServicesConfig(configurationPath, defaultvalues); diff --git a/pom.xml b/pom.xml index 5b28661..8e3c904 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0-rc-2</nuitonValidatorVersion> - <slf4jVersion>1.7.13</slf4jVersion> + <slf4jVersion>1.7.26</slf4jVersion> <xworkVersion>2.3.15.1</xworkVersion> @@ -120,18 +120,18 @@ <!--<resteasy.version>4.0.0.Beta5</resteasy.version>--> <nuitonI18nVersion>3.7</nuitonI18nVersion> - <eugenePluginVersion>2.13</eugenePluginVersion> - <topiaVersion>3.0</topiaVersion> + <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> + <topiaVersion>3.5</topiaVersion> <nuitonWebVersion>1.20</nuitonWebVersion> - <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0</nuitonUtilsVersion> <nuitonConfigVersion>3.4</nuitonConfigVersion> <nuitonCsvVersion>3.0</nuitonCsvVersion> <nuitonDecoratorVersion>3.0</nuitonDecoratorVersion> <nuitonValidatorVersion>3.2</nuitonValidatorVersion> <nuitonConvertorVersion>1.0</nuitonConvertorVersion> - <hibernateVersion>4.3.11.Final</hibernateVersion> + <hibernateVersion>5.2.18.Final</hibernateVersion> <postgresqlVersion>9.4.1212.jre7</postgresqlVersion> <h2Version>1.4.199</h2Version> @@ -223,6 +223,12 @@ <version>${topiaVersion}</version> <scope>runtime</scope> </dependency> + <!-- Force Flyway version cause table changes between 3.x and 4.2, and update is only in 4.2 --> + <dependency> + <groupId>org.flywaydb</groupId> + <artifactId>flyway-core</artifactId> + <version>4.2.0</version> + </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.