branch develop updated (2a78ed4b -> 31fa2d21)
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 2a78ed4b [jgitflow-maven-plugin]updating poms for 3.4-SNAPSHOT development new 9644ef61 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 0ba2fbc3 [jgitflow-maven-plugin]updating poms for branch'release/3.3' with non-snapshot versions new a1f0ff8c [jgitflow-maven-plugin]merging 'release/3.3' into 'master' new 71ffc9f2 [jgitflow-maven-plugin]merging 'master' into 'develop' new 31fa2d21 [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 31fa2d2177dab11cb1ee4b593e6951ef6678f553 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 7 11:22:08 2017 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 71ffc9f2f84a2d07c246c2b65487bab40b1fb151 Merge: 9644ef61 a1f0ff8c Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 7 11:22:07 2017 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 9644ef61b8889fbad6b9db0970de07298fc9b4ac Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 7 11:22:07 2017 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit a1f0ff8c51e69f005b7104272356539ab2112008 Merge: 248bf0f5 0ba2fbc3 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 7 11:22:05 2017 +0200 [jgitflow-maven-plugin]merging 'release/3.3' into 'master' commit 0ba2fbc3597368276d207b779b995b31e414a2e8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 7 11:10:54 2017 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.3' 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 0ba2fbc3597368276d207b779b995b31e414a2e8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 7 11:10:54 2017 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.3' 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 8c36fb29..a32dc3ee 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 5ad4d59a..ae904ade 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.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 371f6a03..79301013 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.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 9206c40b..4e5cd687 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.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index b69576a7..45ddf5fe 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.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 999296f6..2a03d46a 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.3-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 7a8c5ff4..476a1c7b 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.3-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 25abb73d..e5285e88 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.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index c61129c3..61887858 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.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index b6b6a4bd..e13b1cb5 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.3</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 a1f0ff8c51e69f005b7104272356539ab2112008 Merge: 248bf0f5 0ba2fbc3 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 7 11:22:05 2017 +0200 [jgitflow-maven-plugin]merging 'release/3.3' into 'master' pom.xml | 33 +++++++------------ topia-it/pom.xml | 3 +- .../topiatest/persistence/Entity1Impl.hbm.xml | 19 +++++------ .../topia/it/legacy/persistence/NaturalIdTest.java | 5 +-- .../topia/persistence/internal/TopiaDaoTest.java | 2 +- topia-it/src/test/resources/log4j.properties | 4 +-- topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 12 +------ .../SchemaValidationTopiaException.java | 4 +-- .../topia/persistence/TopiaEntityContextable.java | 2 +- .../persistence/jdbc/JdbcConfigurationBuilder.java | 2 -- .../topia/persistence/util/EntityOperator.java | 1 - .../nuiton/topia/persistence/util/TopiaUtil.java | 2 +- topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 24 +++++++++++++- .../TopiaServiceFlywayInitOnCreateSchemaTest.java | 1 - .../src/test/resources/log4j.properties | 1 - topia-service-liquibase/pom.xml | 24 +++++++++++++- topia-service-migration/pom.xml | 2 +- .../src/test/resources/log4j.properties | 3 +- topia-service-replication/pom.xml | 2 +- .../topia/replication/model/ReplicationModel.java | 2 -- .../src/test/resources/log4j.properties | 3 +- topia-templates/pom.xml | 7 +--- .../templates/EntityHibernateMappingGenerator.java | 37 +++++++++++----------- .../topia/templates/TopiaMetaTransformer.java | 1 - .../topia/templates/TopiaTemplateHelper.java | 2 ++ .../topia/templates/TopiaCoreTagValuesTest.java | 1 - 28 files changed, 106 insertions(+), 97 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 9644ef61b8889fbad6b9db0970de07298fc9b4ac Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 7 11:22:07 2017 +0200 [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 9a2ac6b6..a32dc3ee 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.3</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 409ec63c..ae904ade 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-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 88448994..79301013 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-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 3bfa37f1..4e5cd687 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-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index 32a70cec..45ddf5fe 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-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 262e5b11..2a03d46a 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-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 1a34471d..476a1c7b 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-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index d7d80e84..e5285e88 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-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 7708f9a5..61887858 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-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 466f45d1..e13b1cb5 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-SNAPSHOT</version> + <version>3.3</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 71ffc9f2f84a2d07c246c2b65487bab40b1fb151 Merge: 9644ef61 a1f0ff8c Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 7 11:22:07 2017 +0200 [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 31fa2d2177dab11cb1ee4b593e6951ef6678f553 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 7 11:22:08 2017 +0200 [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 a32dc3ee..9a2ac6b6 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index ae904ade..409ec63c 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</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 79301013..88448994 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</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 4e5cd687..3bfa37f1 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</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index 45ddf5fe..32a70cec 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</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 2a03d46a..262e5b11 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.3</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 476a1c7b..1a34471d 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.3</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index e5285e88..d7d80e84 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</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 61887858..7708f9a5 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</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index e13b1cb5..466f45d1 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</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>.
participants (1)
-
nuiton.org scm