branch develop updated (8d60ed3 -> f379e00)
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 8d60ed3 fixes #3689: Use nuitonpom 2.0 new d5ab9ea [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8981e04 [jgitflow-maven-plugin]updating poms for 2.9.5.4 branch with snapshot versions new b4791b5 [jgitflow-maven-plugin]updating poms for branch'release/2.9.5.4' with non-snapshot versions new 5dd5dcb [jgitflow-maven-plugin]merging 'release/2.9.5.4' into 'master' new 4fb7b3c [jgitflow-maven-plugin]merging 'master' into 'develop' new f379e00 [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 f379e002a0804d4e75cd8ee6b80e8b137e778ced Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 13:27:38 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 4fb7b3ca8553b153467a45596d0729518cce6d6c Merge: d5ab9ea 5dd5dcb Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 13:27:38 2015 +0000 [jgitflow-maven-plugin]merging 'master' into 'develop' commit d5ab9eadf70b84c4e3a21804f98f2e2b199aec97 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 13:27:37 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 5dd5dcb6cd6043e8e907a755dc1b098e3cb11a8d Merge: 47c3c26 b4791b5 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 13:27:33 2015 +0000 [jgitflow-maven-plugin]merging 'release/2.9.5.4' into 'master' commit b4791b5e96bb54410cd329eb775a068cef42f3e9 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 13:25:03 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.9.5.4' 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 5dd5dcb6cd6043e8e907a755dc1b098e3cb11a8d Merge: 47c3c26 b4791b5 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 13:27:33 2015 +0000 [jgitflow-maven-plugin]merging 'release/2.9.5.4' into 'master' pom.xml | 4 +-- topia-persistence/pom.xml | 2 +- .../main/java/org/nuiton/topia/TopiaException.java | 2 +- .../topia/generator/BinderHelperTransformer.java | 42 ++++++++++++---------- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-service-security/pom.xml | 2 +- 7 files changed, 31 insertions(+), 25 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 d5ab9eadf70b84c4e3a21804f98f2e2b199aec97 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 13:27:37 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..e64c6fb 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.10-SNAPSHOT</version> + <version>2.9.5.4</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 0c5dc84..606cfb5 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.4</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index c1ca805..05fad1c 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.4</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 200bded..ebbc32e 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.4</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index e3e9608..080d027 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.4</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 4fb7b3ca8553b153467a45596d0729518cce6d6c Merge: d5ab9ea 5dd5dcb Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 13:27:38 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 f379e002a0804d4e75cd8ee6b80e8b137e778ced Author: Maven Release <maven-release@codelutin.com> Date: Fri May 22 13:27:38 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 e64c6fb..20f7cb4 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.9.5.4</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 606cfb5..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.4</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 05fad1c..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.4</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 ebbc32e..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.4</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 080d027..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.4</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