branch develop updated (841fe2b -> de308a2)
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 841fe2b [jgitflow-maven-plugin]updating poms for 4.0.5-SNAPSHOT development new f998d17 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 8c54c7f [jgitflow-maven-plugin]updating poms for branch'release/4.0.4' with non-snapshot versions new 3ce9034 [jgitflow-maven-plugin]merging 'release/4.0.4' into 'master' new 77a4916 [jgitflow-maven-plugin]merging 'master' into 'develop' new de308a2 [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 de308a2a34f78ca3539f90511a36b81bc26fa3d9 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 22 11:56:54 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 77a491682f1212fd81ff761de4b1dd16351536c9 Merge: f998d17 3ce9034 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 22 11:56:53 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit f998d17ffd594248be2118c02789700cb4b44c40 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 22 11:56:53 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 3ce903450777abbb63bcd6d75bae94ce4205b0f2 Merge: ee34b5c 8c54c7f Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 22 11:56:50 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.4' into 'master' commit 8c54c7f9c31b7840d221a42aee2d6698741ed1df Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 22 11:53:23 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.4' 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 8c54c7f9c31b7840d221a42aee2d6698741ed1df Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 22 11:53:23 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.4' 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 21cd6e8..34cf956 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.4-SNAPSHOT</version> + <version>4.0.4</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index f8bfa14..71f717e 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.4-SNAPSHOT</version> + <version>4.0.4</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 83578fb..ed05c78 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.4-SNAPSHOT</version> + <version>4.0.4</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 93440d7..0a7e58d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4</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 3ce903450777abbb63bcd6d75bae94ce4205b0f2 Merge: ee34b5c 8c54c7f Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 22 11:56:50 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.4' into 'master' echobase-domain/pom.xml | 2 +- .../workingDb/h2/3.912-0-atlantos-operation.sql | 4 + .../workingDb/pg/3.912-0-atlantos-operation.sql | 4 + echobase-domain/src/main/xmi/echobase.zargo | Bin 100352 -> 100351 bytes echobase-services/pom.xml | 2 +- .../echobase/services/csv/EchoBaseCsvUtil.java | 2 +- .../service/atlantos/xml/VocabularyExport.java | 78 +++++++------- .../service/atlantos/xml/XmlAccousticExport.java | 115 ++++++++++++++------- .../service/atlantos/xml/XmlBioticExport.java | 36 ++++--- ...ndSpeciesCategoryAndLengthCellImportAction.java | 6 +- ...EchotypeAndSpeciesCategoryCellImportAction.java | 1 - .../VoyageResultsMapFishCellImportAction.java | 4 +- .../VoyageResultsMapOtherCellImportAction.java | 22 ++-- ...dSpeciesCategoryAndLengthImportExportModel.java | 6 +- ...hotypeAndSpeciesCategoryAndLengthImportRow.java | 17 +-- .../csv/VoyageResultsMapOtherCellImportRow.java | 7 +- .../atlantos/ExportAtlantosServiceTest.java | 16 ++- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 19 files changed, 203 insertions(+), 123 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 f998d17ffd594248be2118c02789700cb4b44c40 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 22 11:56:53 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 9ff7939..34cf956 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.5-SNAPSHOT</version> + <version>4.0.4</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 9c2434c..71f717e 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.5-SNAPSHOT</version> + <version>4.0.4</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 2cc9ee2..ed05c78 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.5-SNAPSHOT</version> + <version>4.0.4</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index c25807f..0a7e58d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.5-SNAPSHOT</version> + <version>4.0.4</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 77a491682f1212fd81ff761de4b1dd16351536c9 Merge: f998d17 3ce9034 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 22 11:56:53 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 de308a2a34f78ca3539f90511a36b81bc26fa3d9 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 22 11:56:54 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 34cf956..9ff7939 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.4</version> + <version>4.0.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 71f717e..9c2434c 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.4</version> + <version>4.0.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index ed05c78..2cc9ee2 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.4</version> + <version>4.0.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 0a7e58d..c25807f 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.4</version> + <version>4.0.5-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