branch develop updated (14b9728 -> 9717093)
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 14b9728 fixes #9087: Correction de la selection par defaut incorrecte new cac9fad [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 256682f [jgitflow-maven-plugin]updating poms for 1.5.8 branch with snapshot versions new 0c181ff [jgitflow-maven-plugin]updating poms for branch'release/1.5.8' with non-snapshot versions new b6df1b2 [jgitflow-maven-plugin]merging 'release/1.5.8' into 'master' new 9952a54 [jgitflow-maven-plugin]merging 'master' into 'develop' new 9717093 [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 9717093247f939e396232386e3541e09cca4d65b Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 3 09:16:13 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9952a54544819b30bc8e428d629495880b0896ea Merge: cac9fad b6df1b2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 3 09:16:11 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit cac9fad75e9aec0c90235021d2be8a2e4adee2a0 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 3 09:16:11 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b6df1b26696224e05eb98077e140fd8079a746ec Merge: 951c21b 0c181ff Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 3 09:16:06 2017 +0100 [jgitflow-maven-plugin]merging 'release/1.5.8' into 'master' commit 0c181ff59ec8121f9bd35efb84fdc41888fea6e5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 3 09:11:45 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.5.8' 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 0c181ff59ec8121f9bd35efb84fdc41888fea6e5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 3 09:11:45 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.5.8' 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 c1a4a6b..f6e31d8 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.5.8-SNAPSHOT</version> + <version>1.5.8</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index 9445990..e671490 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.5.8-SNAPSHOT</version> + <version>1.5.8</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index 7ed8db2..4b9b43c 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.5.8-SNAPSHOT</version> + <version>1.5.8</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index 6ef76b1..e18cae8 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.8-SNAPSHOT</version> + <version>1.5.8</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 b6df1b26696224e05eb98077e140fd8079a746ec Merge: 951c21b 0c181ff Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 3 09:16:06 2017 +0100 [jgitflow-maven-plugin]merging 'release/1.5.8' into 'master' coser-business/pom.xml | 2 +- .../ifremer/coser/result/CoserRequestExecutor.java | 21 ++++++++++++++++++++- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- .../coser/web/actions/pop/SpeciesAction.java | 2 +- .../content/{index.jsp => index-success.jsp} | 0 .../src/main/webapp/WEB-INF/content/map/species.jsp | 2 +- .../src/main/webapp/WEB-INF/content/pop/species.jsp | 2 +- pom.xml | 4 ++-- 9 files changed, 28 insertions(+), 9 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 cac9fad75e9aec0c90235021d2be8a2e4adee2a0 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 3 09:16:11 2017 +0100 [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 2a90847..f6e31d8 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.5.8</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index 69e7e60..e671490 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.5.8</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index 99637cc..4b9b43c 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.5.8</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index bec5d2d..e18cae8 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.5.8</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 9952a54544819b30bc8e428d629495880b0896ea Merge: cac9fad b6df1b2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 3 09:16:11 2017 +0100 [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 9717093247f939e396232386e3541e09cca4d65b Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 3 09:16:13 2017 +0100 [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 f6e31d8..2a90847 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.5.8</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index e671490..69e7e60 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.5.8</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index 4b9b43c..99637cc 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.5.8</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index e18cae8..bec5d2d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.8</version> + <version>1.6-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