branch develop updated (c9b828e -> d467cbd)
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 c9b828e Update to eugene 3.0-alpha-8 (Fixes #4069) new 8072486 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8ec7abc [jgitflow-maven-plugin]updating poms for 3.1.3.1 branch with snapshot versions new 7369d1f [jgitflow-maven-plugin]updating poms for branch'release/3.1.3.1' with non-snapshot versions new 25a021e [jgitflow-maven-plugin]merging 'release/3.1.3.1' into 'master' new 81ace9f [jgitflow-maven-plugin]merging 'master' into 'develop' new d467cbd [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 d467cbdd38d5931d3387b50b64842cba565ae5ff Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 13 18:04:16 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 81ace9f22f906dbc5704acf9850bd94e69649152 Merge: 8072486 25a021e Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 13 18:04:16 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 80724869da4ac381d61e3a65e111642175a92aa6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 13 18:04:15 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 25a021ec3bc8de61b17bd3424efb0a5be11bd302 Merge: a612c68 7369d1f Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 13 18:04:13 2016 +0200 [jgitflow-maven-plugin]merging 'release/3.1.3.1' into 'master' commit 7369d1f4f03fc7e83c004c23ad1709961f54aa26 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 13 17:46:16 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.1.3.1' 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 7369d1f4f03fc7e83c004c23ad1709961f54aa26 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 13 17:46:16 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.1.3.1' 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 dcf9db9..bdec3ef 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.1.3.1-SNAPSHOT</version> + <version>3.1.3.1</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index f92b00f..44b5a7f 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.1.3.1-SNAPSHOT</version> + <version>3.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 623d3cc..f22b1c5 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.1.3.1-SNAPSHOT</version> + <version>3.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index f8942a9..a049c48 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.1.3.1-SNAPSHOT</version> + <version>3.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index e4b0663..4d13338 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.1.3.1-SNAPSHOT</version> + <version>3.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 4d45a06..964da9c 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.1.3.1-SNAPSHOT</version> + <version>3.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index baf468a..99040fe 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.1.3.1-SNAPSHOT</version> + <version>3.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 237fe26..0a54c9b 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.1.3.1-SNAPSHOT</version> + <version>3.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index ab86f1a..4b247b5 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.1.3.1-SNAPSHOT</version> + <version>3.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 9d6756b..ae8a341 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.1.3.1-SNAPSHOT</version> + <version>3.1.3.1</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 25a021ec3bc8de61b17bd3424efb0a5be11bd302 Merge: a612c68 7369d1f Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 13 18:04:13 2016 +0200 [jgitflow-maven-plugin]merging 'release/3.1.3.1' into 'master' pom.xml | 14 +- topia-it/pom.xml | 3 +- topia-junit/pom.xml | 3 +- topia-persistence/pom.xml | 3 +- topia-service-csv/pom.xml | 4 +- topia-service-flyway/pom.xml | 5 +- topia-service-liquibase/pom.xml | 5 +- topia-service-migration/pom.xml | 4 +- topia-service-replication/pom.xml | 3 +- topia-templates/pom.xml | 25 +- .../templates/ApplicationContextTransformer.java | 23 +- .../topia/templates/BinderHelperTransformer.java | 4 +- .../topia/templates/EntityDaoTransformer.java | 32 +- .../topia/templates/EntityEnumTransformer.java | 16 +- .../templates/EntityHibernateMappingGenerator.java | 83 +- .../nuiton/topia/templates/EntityTransformer.java | 293 +++--- .../templates/PersistenceContextTransformer.java | 34 +- .../nuiton/topia/templates/TopiaCoreTagValues.java | 418 +++++++++ .../nuiton/topia/templates/TopiaGeneratorUtil.java | 73 +- .../topia/templates/TopiaHibernateTagValues.java | 732 +++++++++++++++ .../nuiton/topia/templates/TopiaJavaValidator.java | 6 +- .../nuiton/topia/templates/TopiaStereoTypes.java | 93 -- .../org/nuiton/topia/templates/TopiaTagValues.java | 997 --------------------- .../topia/templates/TopiaTemplateHelper.java | 113 ++- ...ion.tagvalue.provider.TagValueMetadatasProvider | 2 + ....models.stereotype.StereotypeDefinitionProvider | 1 - ...gene.models.tagvalue.TagValueDefinitionProvider | 1 - .../i18n/topia-templates_en_GB.properties | 40 + .../i18n/topia-templates_fr_FR.properties | 40 + ...ValuesTest.java => TopiaCoreTagValuesTest.java} | 25 +- ...sTest.java => TopiaHibernateTagValuesTest.java} | 12 +- .../topia/templates/TopiaStereoTypesTest.java | 56 -- 32 files changed, 1635 insertions(+), 1528 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 80724869da4ac381d61e3a65e111642175a92aa6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 13 18:04:15 2016 +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 94d7981..bdec3ef 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1.3.1</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 903d4b3..44b5a7f 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.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 79c2744..f22b1c5 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.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 8b3015f..a049c48 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.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index 12cc74f..4d13338 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.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index ee4b4dc..964da9c 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.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 90f3772..99040fe 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.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 4272c16..0a54c9b 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.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index f3636e2..4b247b5 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.1.3.1</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index 76ad400..ae8a341 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.1.3.1</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 81ace9f22f906dbc5704acf9850bd94e69649152 Merge: 8072486 25a021e Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 13 18:04:16 2016 +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 d467cbdd38d5931d3387b50b64842cba565ae5ff Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 13 18:04:16 2016 +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 bdec3ef..94d7981 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.1.3.1</version> + <version>3.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 44b5a7f..903d4b3 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.1.3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index f22b1c5..79c2744 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.1.3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index a049c48..8b3015f 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.1.3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index 4d13338..12cc74f 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.1.3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 964da9c..ee4b4dc 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.1.3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 99040fe..90f3772 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.1.3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 0a54c9b..4272c16 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.1.3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 4b247b5..f3636e2 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.1.3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index ae8a341..76ad400 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.1.3.1</version> + <version>3.2-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