branch develop updated (aeffae1 -> 9d24d16)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia-2.x. See https://gitlab.nuiton.org/nuiton/topia-2.x.git from aeffae1 [jgitflow-maven-plugin]updating poms for 2.12.1-SNAPSHOT development new 94d134c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new dd11390 [jgitflow-maven-plugin]updating poms for branch'release/2.12' with non-snapshot versions new 0aba4be [jgitflow-maven-plugin]merging 'release/2.12' into 'master' new 13b669e [jgitflow-maven-plugin]merging 'master' into 'develop' new 9d24d16 [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 9d24d16b0282d044499bd8e0807a1b4e284734a1 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 11:41:09 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 13b669e010e22621a2defbece0b11a9b829b217f Merge: 94d134c 0aba4be Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 11:41:09 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 94d134cf1159afc31c34cae13be76a7306e41c8e Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 11:41:08 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 0aba4be57a3dac913f36915b407d132c7be2cef2 Merge: 85f5dac dd11390 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 11:41:04 2017 +0100 [jgitflow-maven-plugin]merging 'release/2.12' into 'master' commit dd11390480d63fe5148078ce379ae43b9b826d80 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 11:39:46 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.12' 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-2.x. See https://gitlab.nuiton.org/nuiton/topia-2.x.git commit 13b669e010e22621a2defbece0b11a9b829b217f Merge: 94d134c 0aba4be Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 11:41:09 2017 +0100 [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-2.x. See https://gitlab.nuiton.org/nuiton/topia-2.x.git commit 9d24d16b0282d044499bd8e0807a1b4e284734a1 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 17 11:41:09 2017 +0100 [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 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 62eaa97..7126efe 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.12</version> + <version>2.12.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 97f64c0..0442c2e 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</version> + <version>2.12.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 2d09393..be52a89 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</version> + <version>2.12.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 8f0b71c..7477544 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</version> + <version>2.12.1-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