branch develop updated (85f7d54 -> 6de71e0)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 85f7d54 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop new f2850dc [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d4e6e90 [jgitflow-maven-plugin]updating poms for branch '0.3.1' with snapshot versions new 6eefb00 [jgitflow-maven-plugin]updating poms for branch'release/0.3.1' with non-snapshot versions new d3b4e61 Merge branch 'release/0.3.1' new 9c9e2fe Merge branch 'master' into develop new 6de71e0 [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 6de71e0fe66c745b51a2f2fa3dc3c69eacfd3171 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:53:29 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9c9e2fe0d93cc03b510cc7ecc592e32e8ca748ab Merge: f2850dc d3b4e61 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:53:29 2014 +0000 Merge branch 'master' into develop commit f2850dce387b1800677dac1a435f73a22fbbd2ac Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:53:29 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit d3b4e61a89dda59ad9aacad7204486e9e7bb6a29 Merge: 65c582b 6eefb00 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:53:27 2014 +0000 Merge branch 'release/0.3.1' commit 6eefb00a3e71cbaf15f4baf97eba0cffc7a84292 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:52:41 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.3.1' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 6eefb00a3e71cbaf15f4baf97eba0cffc7a84292 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:52:41 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.3.1' with non-snapshot versions --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 5f0cb4c..c5ebd2b 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3.1-SNAPSHOT</version> + <version>0.3.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index f1ed5d7..a52db2b 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3.1-SNAPSHOT</version> + <version>0.3.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index e061227..c01ec94 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3.1-SNAPSHOT</version> + <version>0.3.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index a7c1d5d..ef171da 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3.1-SNAPSHOT</version> + <version>0.3.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 0b79dd7..0eba203 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3.1-SNAPSHOT</version> + <version>0.3.1</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit d3b4e61a89dda59ad9aacad7204486e9e7bb6a29 Merge: 65c582b 6eefb00 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:53:27 2014 +0000 Merge branch 'release/0.3.1' coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit f2850dce387b1800677dac1a435f73a22fbbd2ac Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:53:29 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index a214705..c5ebd2b 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 1bddff9..a52db2b 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 9793232..c01ec94 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 41ee670..ef171da 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 4585df2..0eba203 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3.1</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 9c9e2fe0d93cc03b510cc7ecc592e32e8ca748ab Merge: f2850dc d3b4e61 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:53:29 2014 +0000 Merge branch 'master' into develop -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 6de71e0fe66c745b51a2f2fa3dc3c69eacfd3171 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:53:29 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index c5ebd2b..a214705 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3.1</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index a52db2b..1bddff9 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3.1</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index c01ec94..9793232 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3.1</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index ef171da..41ee670 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3.1</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 0eba203..4585df2 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3.1</version> + <version>0.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm