branch develop updated (86d2a61 -> b798821)
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 86d2a61 [jgitflow-maven-plugin]updating poms for 4.0.10-SNAPSHOT development new c0be8db [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 251364d [jgitflow-maven-plugin]updating poms for branch'release/4.0.9' with non-snapshot versions new 749e32a [jgitflow-maven-plugin]merging 'release/4.0.9' into 'master' new 6b89c77 [jgitflow-maven-plugin]merging 'master' into 'develop' new b798821 [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 b798821a6ec57f310bc9ee84ab6136506943685f Author: Maven Release <maven-release@codelutin.com> Date: Wed Dec 14 10:10:32 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 6b89c77001ab7df55868cac3db7c4ba22d83998f Merge: c0be8db 749e32a Author: Maven Release <maven-release@codelutin.com> Date: Wed Dec 14 10:10:27 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit c0be8db267983aab32a3a76234064a9768e804b8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Dec 14 10:10:25 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 749e32a4000d8d46a47af943bc0e613935a7f9d9 Merge: 49242ff 251364d Author: Maven Release <maven-release@codelutin.com> Date: Wed Dec 14 10:10:18 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.9' into 'master' commit 251364d3cba617f2602534153fc2510abcc9a5c7 Author: Maven Release <maven-release@codelutin.com> Date: Wed Dec 14 10:07:51 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.9' 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 251364d3cba617f2602534153fc2510abcc9a5c7 Author: Maven Release <maven-release@codelutin.com> Date: Wed Dec 14 10:07:51 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.9' 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 a635531..258a997 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.9-SNAPSHOT</version> + <version>4.0.9</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 3304d0d..f9e134d 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.9-SNAPSHOT</version> + <version>4.0.9</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index fe21210..769b522 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.9-SNAPSHOT</version> + <version>4.0.9</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index f5de574..58d63ee 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.9-SNAPSHOT</version> + <version>4.0.9</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 749e32a4000d8d46a47af943bc0e613935a7f9d9 Merge: 49242ff 251364d Author: Maven Release <maven-release@codelutin.com> Date: Wed Dec 14 10:10:18 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.9' into 'master' echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- .../service/atlantos/ExportAtlantosService.java | 2 +- .../service/atlantos/xml/XmlAccousticExport.java | 164 +++++++++++---------- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- src/site/rst/usage.rst.vm | 18 +-- 7 files changed, 97 insertions(+), 95 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 c0be8db267983aab32a3a76234064a9768e804b8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Dec 14 10:10:25 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 4d7b35a..258a997 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.10-SNAPSHOT</version> + <version>4.0.9</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 2cd956a..f9e134d 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.10-SNAPSHOT</version> + <version>4.0.9</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 6ebc055..769b522 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.10-SNAPSHOT</version> + <version>4.0.9</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index fd366dc..58d63ee 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.10-SNAPSHOT</version> + <version>4.0.9</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 6b89c77001ab7df55868cac3db7c4ba22d83998f Merge: c0be8db 749e32a Author: Maven Release <maven-release@codelutin.com> Date: Wed Dec 14 10:10:27 2016 +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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit b798821a6ec57f310bc9ee84ab6136506943685f Author: Maven Release <maven-release@codelutin.com> Date: Wed Dec 14 10:10:32 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 258a997..4d7b35a 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.9</version> + <version>4.0.10-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index f9e134d..2cd956a 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.9</version> + <version>4.0.10-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 769b522..6ebc055 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.9</version> + <version>4.0.10-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 58d63ee..fd366dc 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.9</version> + <version>4.0.10-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