branch develop updated (d8e184b -> f49fa82)
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 d8e184b [jgitflow-maven-plugin]updating poms for 3.3-SNAPSHOT development new 297b1db [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 5e33469 [jgitflow-maven-plugin]updating poms for branch'release/3.2' with non-snapshot versions new 6675f4a [jgitflow-maven-plugin]merging 'release/3.2' into 'master' new 0b67b69 [jgitflow-maven-plugin]merging 'master' into 'develop' new f49fa82 [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 f49fa82b16b65459299815a52a1bda6f4fe16d6d Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 15 14:02:05 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 0b67b69773a47ac28b2b697d4f6b4c89a223c3b9 Merge: 297b1db 6675f4a Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 15 14:02:05 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 297b1db391dc42737f58dbcfe927f32ab1c6f746 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 15 14:02:05 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 6675f4a98ac2a99edc911be2890b28b37627958e Merge: 97dd087 5e33469 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 15 14:02:02 2016 +0100 [jgitflow-maven-plugin]merging 'release/3.2' into 'master' commit 5e33469d05fab5f149a307dfd7f88210a0573139 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 15 13:54:38 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/3.2' 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 5e33469d05fab5f149a307dfd7f88210a0573139 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 15 13:54:38 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/3.2' with non-snapshot versions --- 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 c9e7a1f..3de16af 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 96f07c9..9418744 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.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 79c2744..fcec6cf 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.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index ba05102..bb23e14 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.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index 12cc74f..ee74b9f 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.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index ee4b4dc..3533e85 100644 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 90f3772..e9601bf 100644 --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 4272c16..7a5984b 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.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index f3636e2..f1630ba 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.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 76ad400..e16ebcf 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.2-SNAPSHOT</version> + <version>3.2</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>.
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 6675f4a98ac2a99edc911be2890b28b37627958e Merge: 97dd087 5e33469 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 15 14:02:02 2016 +0100 [jgitflow-maven-plugin]merging 'release/3.2' into 'master' pom.xml | 14 +- topia-it/pom.xml | 7 +- topia-it/src/license/THIRD-PARTY.properties | 14 +- .../topia/it/legacy/framework/TopiaUtilTest.java | 10 +- .../topia/it/legacy/persistence/NaturalIdTest.java | 6 +- topia-junit/pom.xml | 2 +- topia-junit/src/license/THIRD-PARTY.properties | 14 +- topia-persistence/pom.xml | 7 +- .../src/license/THIRD-PARTY.properties | 18 +- .../SchemaValidationTopiaException.java | 9 +- .../internal/AbstractTopiaApplicationContext.java | 71 ++++---- .../internal/AbstractTopiaPersistenceContext.java | 38 ++++- .../persistence/internal/HibernateProvider.java | 65 ++++++- .../persistence/support/TopiaHibernateSupport.java | 6 + .../nuiton/topia/persistence/util/TopiaUtil.java | 190 ++++++++------------- topia-service-csv/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 13 +- topia-service-flyway/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 11 +- topia-service-liquibase/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 12 +- topia-service-migration/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 12 +- .../migration/AbstractTopiaMigrationCallback.java | 3 +- .../topia/migration/TopiaMigrationEngine.java | 22 ++- .../migration/mappings/TMSVersionHibernateDao.java | 23 ++- .../topia/migration/TopiaMigrationEngineTest.java | 2 +- topia-service-replication/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 12 +- topia-templates/pom.xml | 2 +- topia-templates/src/license/THIRD-PARTY.properties | 15 +- .../topia/templates/EntityDaoTransformer.java | 10 +- 32 files changed, 344 insertions(+), 274 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 297b1db391dc42737f58dbcfe927f32ab1c6f746 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 15 14:02:05 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- 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 dcc79cf..3de16af 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 2502268..9418744 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.3-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 371f6a0..fcec6cf 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.3-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 3a47d2c..bb23e14 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.3-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index b69576a..ee74b9f 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.3-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 613894f..3533e85 100644 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 776007a..e9601bf 100644 --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 25abb73..7a5984b 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.3-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index c61129c..f1630ba 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.3-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index fbf9b09..e16ebcf 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.3-SNAPSHOT</version> + <version>3.2</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>.
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 0b67b69773a47ac28b2b697d4f6b4c89a223c3b9 Merge: 297b1db 6675f4a Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 15 14:02:05 2016 +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 f49fa82b16b65459299815a52a1bda6f4fe16d6d Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 15 14:02:05 2016 +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 3de16af..dcc79cf 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 9418744..2502268 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.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index fcec6cf..371f6a0 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.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index bb23e14..3a47d2c 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.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index ee74b9f..b69576a 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.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 3533e85..613894f 100644 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index e9601bf..776007a 100644 --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 7a5984b..25abb73 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.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index f1630ba..c61129c 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.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index e16ebcf..fbf9b09 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.2</version> + <version>3.3-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