branch develop updated (4e06101 -> b25dc5e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git from 4e06101 [jgitflow-maven-plugin]updating poms for 2.1-SNAPSHOT development new 7a2a058 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new ebcc49f [jgitflow-maven-plugin]updating poms for branch'release/2.0' with non-snapshot versions new cb513c3 [jgitflow-maven-plugin]merging 'release/2.0' into 'master' new 733e82a [jgitflow-maven-plugin]merging 'master' into 'develop' new b25dc5e [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 b25dc5e8e836871d62a1ed7d3d23e4772eb3a644 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 5 17:25:41 2017 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 733e82a937f8b6298f99839e9acc5b80e1cf5b76 Merge: 7a2a058 cb513c3 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 5 17:25:41 2017 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 7a2a05803382a75af62ab88b72191d99435530eb Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 5 17:25:41 2017 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit cb513c385d15ff226358b76728b4756d36734e0b Merge: 1c51dfe ebcc49f Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 5 17:25:40 2017 +0200 [jgitflow-maven-plugin]merging 'release/2.0' into 'master' commit ebcc49f0f7a7d53acc190425ceb2d4c6115f1578 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 5 17:08:03 2017 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.0' 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 https://gitlab.nuiton.org/codelutin/coselmar.git commit ebcc49f0f7a7d53acc190425ceb2d4c6115f1578 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 5 17:08:03 2017 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.0' 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 e95d64f..a83c14b 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 3fb133f..d32a02e 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 9df1b2c..cf76017 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index dc630a4..d740b8c 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 2c943ca..205f728 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</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 https://gitlab.nuiton.org/codelutin/coselmar.git commit cb513c385d15ff226358b76728b4756d36734e0b Merge: 1c51dfe ebcc49f Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 5 17:25:40 2017 +0200 [jgitflow-maven-plugin]merging 'release/2.0' into 'master' 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/css/coselmar.css | 7 +++++++ coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 2 -- coselmar-ui/src/main/webapp/views/home.html | 2 +- pom.xml | 2 +- 8 files changed, 13 insertions(+), 8 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 https://gitlab.nuiton.org/codelutin/coselmar.git commit 7a2a05803382a75af62ab88b72191d99435530eb Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 5 17:25:41 2017 +0200 [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 0f3ac1f..a83c14b 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 8d3ed7c..d32a02e 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index bcf9b30..cf76017 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 37a150f..d740b8c 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 2c1ad62..205f728 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.0</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 https://gitlab.nuiton.org/codelutin/coselmar.git commit 733e82a937f8b6298f99839e9acc5b80e1cf5b76 Merge: 7a2a058 cb513c3 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 5 17:25:41 2017 +0200 [jgitflow-maven-plugin]merging '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 https://gitlab.nuiton.org/codelutin/coselmar.git commit b25dc5e8e836871d62a1ed7d3d23e4772eb3a644 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 5 17:25:41 2017 +0200 [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 a83c14b..0f3ac1f 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index d32a02e..8d3ed7c 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index cf76017..bcf9b30 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index d740b8c..37a150f 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 205f728..2c1ad62 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0</version> + <version>2.1-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