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 f0735fff [jgitflow-maven-plugin]updating poms for 3.5-SNAPSHOT development new 24e1c499 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new c17c1dbd [jgitflow-maven-plugin]updating poms for branch'release/3.4' with non-snapshot versions new 36286ef1 [jgitflow-maven-plugin]merging 'release/3.4' into 'master' new 4ae5aa02 [jgitflow-maven-plugin]merging 'master' into 'develop' new bdeb097d [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 bdeb097d4698d6e3a334b4a546ef1b67958d22b9 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 6 18:40:22 2018 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 4ae5aa029e4a975c66d87e79c5fb1ee3388c5ef5 Merge: 24e1c499 36286ef1 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 6 18:40:21 2018 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 24e1c499a6f42dc3fe169e0b8dcd2b7b172b3468 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 6 18:40:21 2018 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 36286ef1f387f15cd4c186585e9e3d18317a4706 Merge: 88932e36 c17c1dbd Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 6 18:40:19 2018 +0100 [jgitflow-maven-plugin]merging 'release/3.4' into 'master' commit c17c1dbddd0bf2e402cd55300833df4d179db190 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 6 18:21:44 2018 +0100 [jgitflow-maven-plugin]updating poms for branch'release/3.4' with non-snapshot versions Summary of changes: -- 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 36286ef1f387f15cd4c186585e9e3d18317a4706 Merge: 88932e36 c17c1dbd Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 6 18:40:19 2018 +0100 [jgitflow-maven-plugin]merging 'release/3.4' into 'master' pom.xml | 11 +++-- topia-it/pom.xml | 2 +- .../topia/it/legacy/TopiaJpaSupportTest.java | 32 ++++++++++++++ topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 7 +++- .../topia/persistence/BeanTopiaConfiguration.java | 11 +++++ .../topia/persistence/TopiaConfiguration.java | 5 +++ .../persistence/TopiaConfigurationBuilder.java | 49 ++++++++++++++++++++-- .../org/nuiton/topia/persistence/TopiaDao.java | 12 +++++- .../persistence/TopiaQueryBuilderRunQueryStep.java | 12 ++++++ .../persistence/internal/AbstractTopiaDao.java | 31 ++++++++++++++ .../persistence/internal/HibernateProvider.java | 13 ++++-- .../internal/support/HibernateTopiaJpaSupport.java | 49 ++++++++++++++++++++-- .../topia/persistence/support/TopiaJpaSupport.java | 13 ++++++ .../persistence/TopiaConfigurationBuilderTest.java | 1 + 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 +- 24 files changed, 265 insertions(+), 49 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 4ae5aa029e4a975c66d87e79c5fb1ee3388c5ef5 Merge: 24e1c499 36286ef1 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 6 18:40:21 2018 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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 bdeb097d4698d6e3a334b4a546ef1b67958d22b9 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 6 18:40:22 2018 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- topia-it/pom.xml | 2 +- topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 2 +- topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 2 +- topia-service-liquibase/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-templates/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index f3c12fec..f1432a25 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.4</version> + <version>3.5-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 653ac4f7..e9123336 100644 --- a/topia-it/pom.xml +++ b/topia-it/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.4</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 0f86379e..c2e3a028 100644 --- a/topia-junit/pom.xml +++ b/topia-junit/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.4</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index dad8a5b5..3509e55f 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.4</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index fcbb02bb..45843b50 100644 --- a/topia-service-csv/pom.xml +++ b/topia-service-csv/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.4</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index c025c3e3..12909282 100644 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.4</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 4828f920..095019d4 100644 --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.4</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 76fefac7..89db7c92 100644 --- a/topia-service-migration/pom.xml +++ b/topia-service-migration/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.4</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index c176c071..c391619c 100644 --- a/topia-service-replication/pom.xml +++ b/topia-service-replication/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.4</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 249fafd3..bb3c9f8d 100644 --- a/topia-templates/pom.xml +++ b/topia-templates/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.4</version> + <version>3.5-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>.
participants (1)
-
nuiton.org scm