branch develop updated (bb56fe1 -> da8dcf6)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from bb56fe1 [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development new ca04cdd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds aade5e8 [jgitflow-maven-plugin]updating poms for 2.12.1 branch with snapshot versions new c972934 Stick to java 7 for this version new 6deff84 [jgitflow-maven-plugin]updating poms for branch'release/2.12.1' with non-snapshot versions new 21f7034 [jgitflow-maven-plugin]merging 'release/2.12.1' into 'master' new 83ddd64 [jgitflow-maven-plugin]merging 'master' into 'develop' new da8dcf6 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 da8dcf69767628009c00f117370d8aece9c9da5d Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 23 06:41:00 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 83ddd64db2651f94aecd0730f13b1a949f230563 Merge: ca04cdd 21f7034 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 23 06:40:59 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit ca04cdd0776d18e5da90ba0d0b63bd3b12fc7d1d Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 23 06:40:59 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 21f703476504ad03766504ef3b29a59b40189e26 Merge: f326335 6deff84 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 23 06:40:53 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.12.1' into 'master' commit 6deff841c1aa7f25a962cff2bf407f7a49f1eae8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 23 06:38:58 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.12.1' with non-snapshot versions commit c9729343e296f85d48e656d755b3a69354758169 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 23 06:38:45 2016 +0100 Stick to java 7 for this version Summary of changes: pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit c9729343e296f85d48e656d755b3a69354758169 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 23 06:38:45 2016 +0100 Stick to java 7 for this version --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 00a7606..1775dd9 100644 --- a/pom.xml +++ b/pom.xml @@ -131,6 +131,8 @@ <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonWebVersion>1.16</nuitonWebVersion> + + <jettyPluginVersion>9.2.15.v20160210</jettyPluginVersion> <!--<struts2Version>2.3.20</struts2Version>--> <struts2Version>2.3.15.3</struts2Version> -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 6deff841c1aa7f25a962cff2bf407f7a49f1eae8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 23 06:38:58 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.12.1' with non-snapshot versions --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index d3cb411..0bc3e3f 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12.1-SNAPSHOT</version> + <version>2.12.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 5c65172..491727a 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12.1-SNAPSHOT</version> + <version>2.12.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 02fcf4c..b9ba394 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12.1-SNAPSHOT</version> + <version>2.12.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 1775dd9..31c9af3 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12.1-SNAPSHOT</version> + <version>2.12.1</version> <modules> <module>echobase-domain</module> -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 21f703476504ad03766504ef3b29a59b40189e26 Merge: f326335 6deff84 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 23 06:40:53 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.12.1' into 'master' echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 3 ++- pom.xml | 24 +++++++++--------------- src/site/en/rst/importData.rst | 2 +- src/site/en/rst/index.rst | 4 ++-- src/site/en/rst/modifyData.rst | 32 +++++++++++++++++++++++++------- src/site/rst/modifyData.rst | 22 ++++++++++++++++++---- 8 files changed, 59 insertions(+), 32 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit ca04cdd0776d18e5da90ba0d0b63bd3b12fc7d1d Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 23 06:40:59 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index e12787a..0bc3e3f 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>2.12.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index d5a1ead..491727a 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>2.12.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 2838914..b9ba394 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>2.12.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 41f8036..742a29d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>2.12.1</version> <modules> <module>echobase-domain</module> -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 83ddd64db2651f94aecd0730f13b1a949f230563 Merge: ca04cdd 21f7034 Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 23 06:40:59 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit da8dcf69767628009c00f117370d8aece9c9da5d Author: Maven Release <maven-release@codelutin.com> Date: Wed Mar 23 06:41:00 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 0bc3e3f..e12787a 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12.1</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 491727a..d5a1ead 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12.1</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index b9ba394..2838914 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12.1</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 31c9af3..bdf372d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12.1</version> + <version>4.0-SNAPSHOT</version> <modules> <module>echobase-domain</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm