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 74d42f82e0714ba34af9eb434fb3062c349f172e Merge: 1cdec1b7 b5d7179e 0af04972 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 9 14:10:57 2018 +0100 Start 3.4 ; merge branches 'feature/hikari', 'feature/658_use_hibernate_streaming' and 'feature/657_update_to_flyway_5' into develop pom.xml | 4 +- topia-it/pom.xml | 2 +- .../topia/it/legacy/TopiaJpaSupportTest.java | 32 +++++++++++++++ topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 2 +- .../persistence/TopiaQueryBuilderRunQueryStep.java | 12 ++++++ .../persistence/internal/AbstractTopiaDao.java | 25 ++++++++++++ .../internal/support/HibernateTopiaJpaSupport.java | 47 +++++++++++++++++++++- .../topia/persistence/support/TopiaJpaSupport.java | 13 ++++++ topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 2 +- .../nuiton/topia/flyway/TopiaFlywayService.java | 6 +-- .../topia/flyway/TopiaFlywayServiceImpl.java | 18 ++++----- .../TopiaServiceFlywayInitOnCreateSchemaTest.java | 28 +++++++------ topia-service-liquibase/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-templates/pom.xml | 2 +- 18 files changed, 165 insertions(+), 38 deletions(-) diff --cc pom.xml index 66c9d0c6,daae8355,fcac91de..ffcf7dd3 --- a/pom.xml +++ b/pom.xml @@@@ -33,7 -33,7 -33,7 +33,7 @@@@ </parent> <artifactId>topia</artifactId> --- <version>3.3.2-SNAPSHOT</version> +++ <version>3.4-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --cc topia-it/pom.xml index 96f25190,96f25190,96f25190..409ec63c --- a/topia-it/pom.xml +++ b/topia-it/pom.xml @@@@ -30,7 -30,7 -30,7 +30,7 @@@@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> --- <version>3.3.2-SNAPSHOT</version> +++ <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --cc topia-junit/pom.xml index 02eaea15,02eaea15,02eaea15..88448994 --- a/topia-junit/pom.xml +++ b/topia-junit/pom.xml @@@@ -30,7 -30,7 -30,7 +30,7 @@@@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> --- <version>3.3.2-SNAPSHOT</version> +++ <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --cc topia-persistence/pom.xml index 039c2de7,74d4e50a,74d4e50a..94d73a9a --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@@@ -30,7 -30,7 -30,7 +30,7 @@@@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> --- <version>3.3.2-SNAPSHOT</version> +++ <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --cc topia-service-csv/pom.xml index 368d9e97,368d9e97,368d9e97..911e1476 --- a/topia-service-csv/pom.xml +++ b/topia-service-csv/pom.xml @@@@ -30,7 -30,7 -30,7 +30,7 @@@@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> --- <version>3.3.2-SNAPSHOT</version> +++ <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --cc topia-service-flyway/pom.xml index df61ed4b,df61ed4b,df61ed4b..262e5b11 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@@@ -27,7 -27,7 -27,7 +27,7 @@@@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> --- <version>3.3.2-SNAPSHOT</version> +++ <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --cc topia-service-liquibase/pom.xml index b4013fcb,b4013fcb,b4013fcb..1a34471d --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@@@ -27,7 -27,7 -27,7 +27,7 @@@@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> --- <version>3.3.2-SNAPSHOT</version> +++ <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --cc topia-service-migration/pom.xml index 13ea0ac6,13ea0ac6,13ea0ac6..d7d80e84 --- a/topia-service-migration/pom.xml +++ b/topia-service-migration/pom.xml @@@@ -30,7 -30,7 -30,7 +30,7 @@@@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> --- <version>3.3.2-SNAPSHOT</version> +++ <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --cc topia-service-replication/pom.xml index a5982580,a5982580,a5982580..7708f9a5 --- a/topia-service-replication/pom.xml +++ b/topia-service-replication/pom.xml @@@@ -30,7 -30,7 -30,7 +30,7 @@@@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> --- <version>3.3.2-SNAPSHOT</version> +++ <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --cc topia-templates/pom.xml index 80291d0c,80291d0c,80291d0c..466f45d1 --- a/topia-templates/pom.xml +++ b/topia-templates/pom.xml @@@@ -30,7 -30,7 -30,7 +30,7 @@@@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> --- <version>3.3.2-SNAPSHOT</version> +++ <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.