branch develop updated (92002ca -> d195ca5)
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 92002ca [jgitflow-maven-plugin]updating poms for 4.0.3-SNAPSHOT development new b4f35b6 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 958a07b [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' with non-snapshot versions new 66253ff [jgitflow-maven-plugin]merging 'release/4.0.2' into 'master' new f8c9a76 [jgitflow-maven-plugin]merging 'master' into 'develop' new d195ca5 [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 d195ca5b2c2483d54507be788e6473bcab8d74f4 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 12:33:35 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit f8c9a76d8f5ba74e7f3d33ef5b3d4381d1f4d50d Merge: b4f35b6 66253ff Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 12:33:34 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit b4f35b6af0a926a4b67b26d13dfdde6905f6b7cb Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 12:33:34 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 66253ff1052f3c1ef8284b7b3c2057a31c845d09 Merge: bb692df 958a07b Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 12:33:31 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.2' into 'master' commit 958a07b3f47ff21b3e6fe5e69ed3fe68f46f415b Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 12:30:35 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' 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 958a07b3f47ff21b3e6fe5e69ed3fe68f46f415b Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 12:30:35 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' 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 2054942..948155d 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.2-SNAPSHOT</version> + <version>4.0.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 25ec0c3..8281272 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.2-SNAPSHOT</version> + <version>4.0.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 703153b..b2c212a 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.2-SNAPSHOT</version> + <version>4.0.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index b6e8bd3..ed30644 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.2-SNAPSHOT</version> + <version>4.0.2</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 66253ff1052f3c1ef8284b7b3c2057a31c845d09 Merge: bb692df 958a07b Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 12:33:31 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.2' into 'master' echobase-domain/pom.xml | 2 +- .../WorkingDbMigrationCallBackForVersion3_912.java | 53 +++++++++++ .../workingDb/h2/3.912-0-atlantos-operation.sql | 44 +++++++++ .../workingDb/pg/3.912-0-atlantos-operation.sql | 44 +++++++++ echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 100339 -> 100352 bytes echobase-services/pom.xml | 2 +- .../service/atlantos/ExportAtlantosService.java | 2 +- .../service/atlantos/xml/VocabularyExport.java | 30 +++++-- .../service/atlantos/xml/XmlAccousticExport.java | 4 +- .../service/atlantos/xml/XmlBioticExport.java | 82 ++++++++++++----- ...=> MismatchLengthCategoryMeaningException.java} | 8 +- .../service/importdata/SizeCategoryCache.java | 5 ++ ...ndSpeciesCategoryAndLengthCellImportAction.java | 23 +++-- ...sEsduByEchotypeAndSpeciesCategoryImportRow.java | 1 + .../csv/MooringResultsEsduByEchotypeImportRow.java | 1 + ...VoyageOperationsOperationImportExportModel.java | 8 +- .../csv/VoyageOperationsOperationImportRow.java | 16 ++-- ...dSpeciesCategoryAndLengthImportExportModel.java | 6 +- ...hotypeAndSpeciesCategoryAndLengthImportRow.java | 20 +++-- ...sEsduByEchotypeAndSpeciesCategoryImportRow.java | 1 + .../csv/VoyageResultsEsduByEchotypeImportRow.java | 1 + ...esultsEsduBySpeciesAndAgeCategoryImportRow.java | 1 + echobase-services/src/main/resources/actual | 99 +++++++++++++++++++++ echobase-services/src/main/resources/expected | 99 +++++++++++++++++++++ .../i18n/echobase-services_en_GB.properties | 2 +- .../i18n/echobase-services_fr_FR.properties | 2 +- .../import-data/operation/operation.csv.gz | Bin 6053 -> 6056 bytes .../import-data/result/esdu/byEchotype.csv.gz | Bin 73195 -> 72758 bytes ...chotypeAndSpeciesCategoryAndLength_small.csv.gz | Bin 2585 -> 2605 bytes .../result/esdu/byEchotype_small.csv.gz | Bin 2802 -> 2791 bytes echobase-ui/pom.xml | 2 +- pom.xml | 2 +- src/site/en/rst/importData.rst | 57 +++++++----- src/site/rst/importData.rst | 47 ++++++---- 35 files changed, 549 insertions(+), 117 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 b4f35b6af0a926a4b67b26d13dfdde6905f6b7cb Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 12:33:34 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 c8c2ba3..948155d 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.3-SNAPSHOT</version> + <version>4.0.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index aa79fff..8281272 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.3-SNAPSHOT</version> + <version>4.0.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 40a58ef..b2c212a 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.3-SNAPSHOT</version> + <version>4.0.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 9e4375b..ed30644 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.2</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 f8c9a76d8f5ba74e7f3d33ef5b3d4381d1f4d50d Merge: b4f35b6 66253ff Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 12:33:34 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 d195ca5b2c2483d54507be788e6473bcab8d74f4 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 8 12:33:35 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 948155d..c8c2ba3 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.2</version> + <version>4.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 8281272..aa79fff 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.2</version> + <version>4.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index b2c212a..40a58ef 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.2</version> + <version>4.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index ed30644..9e4375b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.2</version> + <version>4.0.3-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