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>.