branch develop updated (310a59e -> 9bf9d76)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See http://git.nuiton.org/topia.git from 310a59e [jgitflow-maven-plugin]updating poms for 2.9.4-SNAPSHOT development new e66af1b [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 616beff [jgitflow-maven-plugin]updating poms for branch'release/2.9.3' with non-snapshot versions new 7a88384 Merge branch 'release/2.9.3' new e3d9848 Merge branch 'master' into develop new 9bf9d76 [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 9bf9d76c5884b5bd1883305d1df34a98ce2d03ee Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 24 15:49:07 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e3d9848f115ecb93598b814db2addc6445b2ab9a Merge: e66af1b 7a88384 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 24 15:49:07 2014 +0000 Merge branch 'master' into develop commit e66af1b379942098555bbb09a225e5c769ae9bc6 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 24 15:49:07 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 7a88384dd6c1cd58bb9488ff016c54247c089139 Merge: e5c160b 616beff Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 24 15:49:05 2014 +0000 Merge branch 'release/2.9.3' commit 616beff7fb72637b18e04f67207a4eadbc7546dc Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 24 15:45:14 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.9.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 http://git.nuiton.org/topia.git commit 616beff7fb72637b18e04f67207a4eadbc7546dc Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 24 15:45:14 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.9.3' with non-snapshot versions --- pom.xml | 2 +- topia-persistence/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-service-security/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index bf6ef79..27594ea 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.9.3-SNAPSHOT</version> + <version>2.9.3</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 88b19b2..d05bff1 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.9.3-SNAPSHOT</version> + <version>2.9.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index d0d1254..fa698e9 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>2.9.3-SNAPSHOT</version> + <version>2.9.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 9c1f6ee..4466ab2 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>2.9.3-SNAPSHOT</version> + <version>2.9.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index 22cd255..6c79998 100644 --- a/topia-service-security/pom.xml +++ b/topia-service-security/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.9.3-SNAPSHOT</version> + <version>2.9.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 http://git.nuiton.org/topia.git commit 7a88384dd6c1cd58bb9488ff016c54247c089139 Merge: e5c160b 616beff Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 24 15:49:05 2014 +0000 Merge branch 'release/2.9.3' pom.xml | 34 ++----- src/site/site.xml | 69 +++++++++++++ src/site/site_fr.xml | 112 --------------------- topia-persistence/pom.xml | 2 +- .../generator/EntityHibernateMappingGenerator.java | 13 ++- .../nuiton/topia/generator/TopiaGeneratorUtil.java | 27 ++--- .../org/nuiton/topia/generator/TopiaTagValues.java | 4 +- topia-persistence/src/site/site.xml | 92 +++++++++++++++++ topia-persistence/src/site/site_fr.xml | 109 -------------------- topia-service-migration/pom.xml | 2 +- .../migration/AbstractTopiaMigrationCallback.java | 2 +- .../migration/TopiaMigrationCallbackByClass.java | 2 +- .../migration/TopiaMigrationCallbackByClassNG.java | 8 +- .../migration/TopiaMigrationCallbackByMethod.java | 2 +- .../topia/migration/TopiaMigrationEngine.java | 59 ++++++++--- .../topia/migration/mappings/TMSVersion.java | 6 +- .../topia/migration/mappings/TMSVersionDAO.java | 6 +- topia-service-migration/src/site/site.xml | 61 +++++++++++ topia-service-migration/src/site/site_fr.xml | 81 --------------- topia-service-replication/pom.xml | 2 +- topia-service-replication/src/site/site.xml | 58 +++++++++++ topia-service-replication/src/site/site_fr.xml | 78 -------------- topia-service-security/pom.xml | 2 +- topia-service-security/src/site/site.xml | 65 ++++++++++++ topia-service-security/src/site/site_fr.xml | 85 ---------------- 25 files changed, 433 insertions(+), 548 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 http://git.nuiton.org/topia.git commit e66af1b379942098555bbb09a225e5c769ae9bc6 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 24 15:49:07 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- topia-persistence/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-service-security/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index f65829a..27594ea 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.9.4-SNAPSHOT</version> + <version>2.9.3</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index c4b91a8..d05bff1 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.9.4-SNAPSHOT</version> + <version>2.9.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index f77c2fe..fa698e9 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>2.9.4-SNAPSHOT</version> + <version>2.9.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 67a6475..4466ab2 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>2.9.4-SNAPSHOT</version> + <version>2.9.3</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index 8558783..6c79998 100644 --- a/topia-service-security/pom.xml +++ b/topia-service-security/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.9.4-SNAPSHOT</version> + <version>2.9.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 http://git.nuiton.org/topia.git commit e3d9848f115ecb93598b814db2addc6445b2ab9a Merge: e66af1b 7a88384 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 24 15:49:07 2014 +0000 Merge branch '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 http://git.nuiton.org/topia.git commit 9bf9d76c5884b5bd1883305d1df34a98ce2d03ee Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 24 15:49:07 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- topia-persistence/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-service-security/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 27594ea..f65829a 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.9.3</version> + <version>2.9.4-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index d05bff1..c4b91a8 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.9.3</version> + <version>2.9.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index fa698e9..f77c2fe 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>2.9.3</version> + <version>2.9.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 4466ab2..67a6475 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>2.9.3</version> + <version>2.9.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index 6c79998..8558783 100644 --- a/topia-service-security/pom.xml +++ b/topia-service-security/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.9.3</version> + <version>2.9.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