branch develop updated (410c691 -> 450d0dd)
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 410c691 fixes #3690: Generated BinderHelper must use inheritance attributes also Merge branch 'feature/3690' into develop new b868614 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2973f6d [jgitflow-maven-plugin]updating poms for 2.9.5.5 branch with snapshot versions new 8bff4f1 [jgitflow-maven-plugin]updating poms for branch'release/2.9.5.5' with non-snapshot versions new 8a82ec4 [jgitflow-maven-plugin]merging 'release/2.9.5.5' into 'master' new d0641a8 [jgitflow-maven-plugin]merging 'master' into 'develop' new 450d0dd [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 450d0dd863c9b3835200615860bce3d586890039 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 14:26:58 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit d0641a84c0b07c258eaf8716c78d5091da40be03 Merge: b868614 8a82ec4 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 14:26:57 2015 +0000 [jgitflow-maven-plugin]merging 'master' into 'develop' commit b8686141c8dd57664db99c00e906b6a831ab0c9c Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 14:26:56 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 8a82ec403300e8e5e29b435dffbc8510f96d7933 Merge: 5dd5dcb 8bff4f1 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 14:26:54 2015 +0000 [jgitflow-maven-plugin]merging 'release/2.9.5.5' into 'master' commit 8bff4f178aabc6c43d564df0ac0abe44eb57f5d6 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 14:23:52 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.9.5.5' 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 8bff4f178aabc6c43d564df0ac0abe44eb57f5d6 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 14:23:52 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.9.5.5' 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 2a5a957..0d8be0a 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.9.5.5-SNAPSHOT</version> + <version>2.9.5.5</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 0208fd0..edf163f 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.5-SNAPSHOT</version> + <version>2.9.5.5</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index a3c3012..2028f18 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.5-SNAPSHOT</version> + <version>2.9.5.5</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index d83efd9..6664b58 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.5-SNAPSHOT</version> + <version>2.9.5.5</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index ace12e7..4e39da1 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.5-SNAPSHOT</version> + <version>2.9.5.5</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 8a82ec403300e8e5e29b435dffbc8510f96d7933 Merge: 5dd5dcb 8bff4f1 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 14:26:54 2015 +0000 [jgitflow-maven-plugin]merging 'release/2.9.5.5' into 'master' pom.xml | 2 +- topia-persistence/pom.xml | 2 +- .../main/java/org/nuiton/topia/generator/BinderHelperTransformer.java | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-service-security/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 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 b8686141c8dd57664db99c00e906b6a831ab0c9c Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 14:26:56 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 20f7cb4..0d8be0a 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.10-SNAPSHOT</version> + <version>2.9.5.5</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 0c5dc84..edf163f 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.5</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index c1ca805..2028f18 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.5</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 200bded..6664b58 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.5</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index e3e9608..4e39da1 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.5</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 d0641a84c0b07c258eaf8716c78d5091da40be03 Merge: b868614 8a82ec4 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 14:26:57 2015 +0000 [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 http://git.nuiton.org/topia.git commit 450d0dd863c9b3835200615860bce3d586890039 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 14:26:58 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 0d8be0a..20f7cb4 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.9.5.5</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 edf163f..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.5</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 2028f18..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.5</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 6664b58..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.5</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 4e39da1..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.5</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