branch develop updated (1293e7b -> 4941c00)
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 1293e7b refs #3675 improve index name (swap table name and column name) new c3922fd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a822f13 [jgitflow-maven-plugin]updating poms for branch '2.9.5.2' with snapshot versions new 4c82003 [jgitflow-maven-plugin]updating poms for branch'release/2.9.5.2' with non-snapshot versions new 961da89 Merge branch 'release/2.9.5.2' new a349164 Merge branch 'master' into develop new 4941c00 [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 4941c00367342d55002df22964bc707123ecaa8e Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:02:46 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit a349164d5070974ccd71510a2668a2d69a6dda45 Merge: c3922fd 961da89 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:02:45 2015 +0000 Merge branch 'master' into develop commit c3922fd1ca059b45f3bdbcd997c0b3b08b3701d1 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:02:45 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 961da89b407742edc0086551fd3ad10c29980f8b Merge: dfe35b1 4c82003 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:02:43 2015 +0000 Merge branch 'release/2.9.5.2' commit 4c8200373a3acbe1f14c84f15cd7feed147a7a76 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:00:28 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.9.5.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 http://git.nuiton.org/topia.git commit 4c8200373a3acbe1f14c84f15cd7feed147a7a76 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:00:28 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.9.5.2' 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 131ca89..d7dc3a4 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.9.5.2-SNAPSHOT</version> + <version>2.9.5.2</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 9f8a425..9bdd8c2 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.5.2-SNAPSHOT</version> + <version>2.9.5.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index c7cb24d..30bf5b6 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.5.2-SNAPSHOT</version> + <version>2.9.5.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 9c2a86c..624368e 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.5.2-SNAPSHOT</version> + <version>2.9.5.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index 858f4c0..e107fd9 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.5.2-SNAPSHOT</version> + <version>2.9.5.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 http://git.nuiton.org/topia.git commit 961da89b407742edc0086551fd3ad10c29980f8b Merge: dfe35b1 4c82003 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:02:43 2015 +0000 Merge branch 'release/2.9.5.2' pom.xml | 2 +- topia-persistence/pom.xml | 2 +- .../generator/EntityHibernateMappingGenerator.java | 23 +++++++--- .../nuiton/topia/generator/TopiaGeneratorUtil.java | 49 +++++++++++++++++++++- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-service-security/pom.xml | 2 +- 7 files changed, 69 insertions(+), 13 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 c3922fd1ca059b45f3bdbcd997c0b3b08b3701d1 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:02:45 2015 +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 0c201ac..d7dc3a4 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.10-SNAPSHOT</version> + <version>2.9.5.2</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 0c5dc84..9bdd8c2 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.10-SNAPSHOT</version> + <version>2.9.5.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index c1ca805..30bf5b6 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.10-SNAPSHOT</version> + <version>2.9.5.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 200bded..624368e 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.10-SNAPSHOT</version> + <version>2.9.5.2</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index e3e9608..e107fd9 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.10-SNAPSHOT</version> + <version>2.9.5.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 http://git.nuiton.org/topia.git commit a349164d5070974ccd71510a2668a2d69a6dda45 Merge: c3922fd 961da89 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:02:45 2015 +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 4941c00367342d55002df22964bc707123ecaa8e Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:02:46 2015 +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 d7dc3a4..0c201ac 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.9.5.2</version> + <version>2.10-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 9bdd8c2..0c5dc84 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.5.2</version> + <version>2.10-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 30bf5b6..c1ca805 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.5.2</version> + <version>2.10-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 624368e..200bded 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.5.2</version> + <version>2.10-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index e107fd9..e3e9608 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.5.2</version> + <version>2.10-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