branch develop updated (be595c0 -> 94b233d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coser. See https://gitlab.nuiton.org/codelutin/coser.git from be595c0 [jgitflow-maven-plugin]updating poms for 1.6.1-SNAPSHOT development new 50c322f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new d8dc45f [jgitflow-maven-plugin]updating poms for branch'release/1.6' with non-snapshot versions new 1c28229 [jgitflow-maven-plugin]merging 'release/1.6' into 'master' new 3e1f3c9 [jgitflow-maven-plugin]merging 'master' into 'develop' new 94b233d [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 94b233df1768cd9176c62e167d13e357fb0925af Author: jcouteau <couteau@codelutin.com> Date: Fri May 4 11:11:23 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3e1f3c9095f32909e5baa99fb863b615a834eb93 Merge: 50c322f 1c28229 Author: jcouteau <couteau@codelutin.com> Date: Fri May 4 11:11:22 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 50c322f9d82059b16acee0978d54694a22331013 Author: jcouteau <couteau@codelutin.com> Date: Fri May 4 11:11:22 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 1c28229c857c35a76e2248ccb598e884cb70212f Merge: d19143b d8dc45f Author: jcouteau <couteau@codelutin.com> Date: Fri May 4 11:11:21 2018 +0200 [jgitflow-maven-plugin]merging 'release/1.6' into 'master' commit d8dc45f6be7d4e159363ed2d8a0cc2f1c60caa5c Author: jcouteau <couteau@codelutin.com> Date: Fri May 4 11:09:03 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.6' 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 coser. See https://gitlab.nuiton.org/codelutin/coser.git commit d8dc45f6be7d4e159363ed2d8a0cc2f1c60caa5c Author: jcouteau <couteau@codelutin.com> Date: Fri May 4 11:09:03 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.6' with non-snapshot versions --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 2a90847..bfe38e2 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index 69e7e60..28035e8 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index 99637cc..ec6035d 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index b3eb4ec..229c6c2 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> <packaging>pom</packaging> <name>Coser</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 coser. See https://gitlab.nuiton.org/codelutin/coser.git commit 1c28229c857c35a76e2248ccb598e884cb70212f Merge: d19143b d8dc45f Author: jcouteau <couteau@codelutin.com> Date: Fri May 4 11:11:21 2018 +0200 [jgitflow-maven-plugin]merging 'release/1.6' into 'master' .gitlab-ci.yml | 20 +++++++++++++++ coser-business/pom.xml | 2 +- .../java/fr/ifremer/coser/result/util/Charts.java | 2 +- .../ifremer/coser/services/PublicationService.java | 8 +++--- coser-ui/pom.xml | 2 +- .../main/resources/i18n/coser-ui_en_GB.properties | 2 +- .../main/resources/i18n/coser-ui_fr_FR.properties | 2 +- coser-web/pom.xml | 2 +- pom.xml | 30 +++++++++++----------- 9 files changed, 45 insertions(+), 25 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 coser. See https://gitlab.nuiton.org/codelutin/coser.git commit 50c322f9d82059b16acee0978d54694a22331013 Author: jcouteau <couteau@codelutin.com> Date: Fri May 4 11:11:22 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 2cc7f51..bfe38e2 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index 308750d..28035e8 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index 81f5c78..ec6035d 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index b29b785..229c6c2 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6</version> <packaging>pom</packaging> <name>Coser</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 coser. See https://gitlab.nuiton.org/codelutin/coser.git commit 3e1f3c9095f32909e5baa99fb863b615a834eb93 Merge: 50c322f 1c28229 Author: jcouteau <couteau@codelutin.com> Date: Fri May 4 11:11:22 2018 +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 coser. See https://gitlab.nuiton.org/codelutin/coser.git commit 94b233df1768cd9176c62e167d13e357fb0925af Author: jcouteau <couteau@codelutin.com> Date: Fri May 4 11:11:23 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index bfe38e2..2cc7f51 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6</version> + <version>1.6.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index 28035e8..308750d 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6</version> + <version>1.6.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index ec6035d..81f5c78 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6</version> + <version>1.6.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index 229c6c2..b29b785 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6</version> + <version>1.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Coser</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm