branch develop updated (309b6ae -> fdb8c5b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git from 309b6ae When migration fails, must throw an exception (Fixes #4080) new 42e62ea Remove deprecated usage of guava Iterators.emptyIterator() (Fixes #4082) new e7e0b6e Updates to guava 20 (Fixes #4083) new d9a3acc Updates liquidbase to 3.5.3 (Fixes #4084) new b641091 Updates flyway to 4.0.3 (Fixes #4085) new 477f3c0 Updates beanutils to 1.9.3 (Fixes #4086) new fc409d9 Updates commons-lang3 to 3.5 (Fixes #4087) new b7db629 Updates mockito to 2.2.29 (Fixes #4088) new aaa694c Updates nuiton-csv to 3.0-rc-6 (Fixes #4089) new 923aa40 Updates nuiton-utils to 3.0-rc-16 (Fixes #4090) new fdb8c5b Updates eugene to 3.0-alpha-10 (Fixes #4091) The 10 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 fdb8c5b02877cd8a1152b5ff1d17b6c4aec146fd Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:40:47 2016 +0100 Updates eugene to 3.0-alpha-10 (Fixes #4091) commit 923aa4039dc583e726d2ec1e6c4885f2e5989ac4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:40:13 2016 +0100 Updates nuiton-utils to 3.0-rc-16 (Fixes #4090) commit aaa694c408993f745226cb50ed392104cdced585 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:39:52 2016 +0100 Updates nuiton-csv to 3.0-rc-6 (Fixes #4089) commit b7db629c18646d6456e5fcb800dbfaf234e8b3ef Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:39:29 2016 +0100 Updates mockito to 2.2.29 (Fixes #4088) commit fc409d969b8c92d4149556c51858660a94ac13e8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:38:48 2016 +0100 Updates commons-lang3 to 3.5 (Fixes #4087) commit 477f3c061f8f7b164376b4ccb28085f9e7d6d3d0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:38:20 2016 +0100 Updates beanutils to 1.9.3 (Fixes #4086) 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) commit d9a3acc6e25c08de6d718fe45025a5a9ae33877d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:37:02 2016 +0100 Updates liquidbase to 3.5.3 (Fixes #4084) commit e7e0b6ef782987907981014f413b32cdf11269b5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:32:16 2016 +0100 Updates to guava 20 (Fixes #4083) commit 42e62ead129bedac6a95d5f6d00c223855d5f44f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:30:39 2016 +0100 Remove deprecated usage of guava Iterators.emptyIterator() (Fixes #4082) Summary of changes: pom.xml | 18 +++++++++--------- .../topia/persistence/internal/AbstractTopiaDao.java | 3 +-- .../nuiton/topia/flyway/TopiaFlywayServiceImpl.java | 7 ++++--- 3 files changed, 14 insertions(+), 14 deletions(-) -- 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 develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 42e62ead129bedac6a95d5f6d00c223855d5f44f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:30:39 2016 +0100 Remove deprecated usage of guava Iterators.emptyIterator() (Fixes #4082) --- .../java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java index 6a6b503..7f44b5d 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java @@ -30,7 +30,6 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Iterables; -import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.beanutils.PropertyUtils; @@ -806,7 +805,7 @@ public abstract class AbstractTopiaDao<E extends TopiaEntity> implements TopiaDa pager = dao.initPagination(hql, params, batchSize); // empty iterator (will be changed at first next call) - data = Iterators.emptyIterator(); + data = Collections.emptyIterator(); firstPageLoaded = false; } -- 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 develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit e7e0b6ef782987907981014f413b32cdf11269b5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:32:16 2016 +0100 Updates to guava 20 (Fixes #4083) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a7e0ad7..26e0882 100644 --- a/pom.xml +++ b/pom.xml @@ -219,7 +219,7 @@ <commonsLoggingVersion>1.2</commonsLoggingVersion> <eugeneVersion>3.0-alpha-9</eugeneVersion> <flywayVersion>3.1</flywayVersion> - <guavaVersion>19.0</guavaVersion> + <guavaVersion>20.0</guavaVersion> <!-- Do not upgrade H2 to 1.4 see #3691 --> <h2Version>1.3.176</h2Version> -- 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 develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit d9a3acc6e25c08de6d718fe45025a5a9ae33877d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:37:02 2016 +0100 Updates liquidbase to 3.5.3 (Fixes #4084) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 26e0882..0df2d48 100644 --- a/pom.xml +++ b/pom.xml @@ -228,7 +228,7 @@ <hibernateVersion>4.3.11.Final</hibernateVersion> <javassistVersion>3.20.0-GA</javassistVersion> <junitVersion>4.12</junitVersion> - <liquibaseVersion>3.5.0</liquibaseVersion> + <liquibaseVersion>3.5.3</liquibaseVersion> <log4jVersion>1.2.17</log4jVersion> <mockitoVersion>2.0.52-beta</mockitoVersion> <nuitonUtilsVersion>3.0-rc-13</nuitonUtilsVersion> -- 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 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>.
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 477f3c061f8f7b164376b4ccb28085f9e7d6d3d0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:38:20 2016 +0100 Updates beanutils to 1.9.3 (Fixes #4086) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index abf3654..701b7cc 100644 --- a/pom.xml +++ b/pom.xml @@ -379,7 +379,7 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.2</version> + <version>1.9.3</version> </dependency> <dependency> -- 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 develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit fc409d969b8c92d4149556c51858660a94ac13e8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:38:48 2016 +0100 Updates commons-lang3 to 3.5 (Fixes #4087) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 701b7cc..1a0bee4 100644 --- a/pom.xml +++ b/pom.xml @@ -397,7 +397,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.4</version> + <version>3.5</version> </dependency> <!-- BD H2 for testing --> -- 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 develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit b7db629c18646d6456e5fcb800dbfaf234e8b3ef Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:39:29 2016 +0100 Updates mockito to 2.2.29 (Fixes #4088) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a0bee4..53b0424 100644 --- a/pom.xml +++ b/pom.xml @@ -230,7 +230,7 @@ <junitVersion>4.12</junitVersion> <liquibaseVersion>3.5.3</liquibaseVersion> <log4jVersion>1.2.17</log4jVersion> - <mockitoVersion>2.0.52-beta</mockitoVersion> + <mockitoVersion>2.2.29</mockitoVersion> <nuitonUtilsVersion>3.0-rc-13</nuitonUtilsVersion> <nuitonCsvVersion>3.0-rc-5</nuitonCsvVersion> <nuitonDecoratorVersion>3.0</nuitonDecoratorVersion> -- 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 develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit aaa694c408993f745226cb50ed392104cdced585 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:39:52 2016 +0100 Updates nuiton-csv to 3.0-rc-6 (Fixes #4089) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 53b0424..d16010b 100644 --- a/pom.xml +++ b/pom.xml @@ -232,7 +232,7 @@ <log4jVersion>1.2.17</log4jVersion> <mockitoVersion>2.2.29</mockitoVersion> <nuitonUtilsVersion>3.0-rc-13</nuitonUtilsVersion> - <nuitonCsvVersion>3.0-rc-5</nuitonCsvVersion> + <nuitonCsvVersion>3.0-rc-6</nuitonCsvVersion> <nuitonDecoratorVersion>3.0</nuitonDecoratorVersion> <nuitonI18nVersion>3.5</nuitonI18nVersion> <processorPluginVersion>1.3</processorPluginVersion> -- 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 develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 923aa4039dc583e726d2ec1e6c4885f2e5989ac4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:40:13 2016 +0100 Updates nuiton-utils to 3.0-rc-16 (Fixes #4090) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d16010b..d40ba3c 100644 --- a/pom.xml +++ b/pom.xml @@ -231,7 +231,7 @@ <liquibaseVersion>3.5.3</liquibaseVersion> <log4jVersion>1.2.17</log4jVersion> <mockitoVersion>2.2.29</mockitoVersion> - <nuitonUtilsVersion>3.0-rc-13</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-rc-16</nuitonUtilsVersion> <nuitonCsvVersion>3.0-rc-6</nuitonCsvVersion> <nuitonDecoratorVersion>3.0</nuitonDecoratorVersion> <nuitonI18nVersion>3.5</nuitonI18nVersion> -- 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 develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit fdb8c5b02877cd8a1152b5ff1d17b6c4aec146fd Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 9 14:40:47 2016 +0100 Updates eugene to 3.0-alpha-10 (Fixes #4091) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d40ba3c..719d728 100644 --- a/pom.xml +++ b/pom.xml @@ -217,7 +217,7 @@ <!-- libs version --> <commonsLoggingVersion>1.2</commonsLoggingVersion> - <eugeneVersion>3.0-alpha-9</eugeneVersion> + <eugeneVersion>3.0-alpha-10</eugeneVersion> <flywayVersion>4.0.3</flywayVersion> <guavaVersion>20.0</guavaVersion> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm