branch develop updated (adde769 -> 35587b1)
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 adde769 [jgitflow-maven-plugin]updating poms for 2.12-SNAPSHOT development new 2ea7dcb [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 14e2518 [jgitflow-maven-plugin]updating poms for branch'release/2.11' with non-snapshot versions new 85f5dac [jgitflow-maven-plugin]merging 'release/2.11' into 'master' new fda82d2 [jgitflow-maven-plugin]merging 'master' into 'develop' new 35587b1 [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 35587b1facf473687b995f68aa646eec397946b9 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 13 08:27:00 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit fda82d21009edaa76dbc1e8fd1233080b861b659 Merge: 2ea7dcb 85f5dac Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 13 08:26:58 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 2ea7dcbabf6bf5458128e89a87e009ad864060ce Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 13 08:26:57 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 85f5dac2db9f560e89d8d53ce306dc6803bd7eb9 Merge: 78c8c4b 14e2518 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 13 08:26:55 2015 +0200 [jgitflow-maven-plugin]merging 'release/2.11' into 'master' commit 14e2518a7cbf718f7c6b0c1c11f1b5ddac932d2e Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 13 08:24:00 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.11' 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 14e2518a7cbf718f7c6b0c1c11f1b5ddac932d2e Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 13 08:24:00 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.11' 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 23a14f8..e8127e9 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.11-SNAPSHOT</version> + <version>2.11</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index d3fb40e..daa33cf 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.11-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index a3510cc..427e07f 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.11-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 5d7b4cd..8d250b8 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.11-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index 692efa5..87f74bb 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.11-SNAPSHOT</version> + <version>2.11</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 85f5dac2db9f560e89d8d53ce306dc6803bd7eb9 Merge: 78c8c4b 14e2518 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 13 08:26:55 2015 +0200 [jgitflow-maven-plugin]merging 'release/2.11' into 'master' pom.xml | 4 ++-- topia-persistence/pom.xml | 2 +- .../java/org/nuiton/topia/generator/BinderHelperTransformer.java | 9 ++++++++- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-service-security/pom.xml | 2 +- 6 files changed, 14 insertions(+), 7 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 2ea7dcbabf6bf5458128e89a87e009ad864060ce Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 13 08:26:57 2015 +0200 [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 8897509..e8127e9 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.11</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index d7c3ea8..daa33cf 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.12-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index df6a238..427e07f 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.12-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 4d99705..8d250b8 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.12-SNAPSHOT</version> + <version>2.11</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index 6aaab0d..87f74bb 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.12-SNAPSHOT</version> + <version>2.11</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 fda82d21009edaa76dbc1e8fd1233080b861b659 Merge: 2ea7dcb 85f5dac Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 13 08:26:58 2015 +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 http://git.nuiton.org/topia.git commit 35587b1facf473687b995f68aa646eec397946b9 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 13 08:27:00 2015 +0200 [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 e8127e9..8897509 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.11</version> + <version>2.12-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index daa33cf..d7c3ea8 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.11</version> + <version>2.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 427e07f..df6a238 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.11</version> + <version>2.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 8d250b8..4d99705 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.11</version> + <version>2.12-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index 87f74bb..6aaab0d 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.11</version> + <version>2.12-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