This is an automated email from the git hooks/post-receive script. New change to branch master in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from bb692df [jgitflow-maven-plugin]merging 'release/4.0.1' into 'master' adds 2b9173a #8724 Modify latitude and longitude for hauling adds e577c87 [jgitflow-maven-plugin]updating poms for 4.0.2-SNAPSHOT development adds eb2bf63 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds c9c54ca [jgitflow-maven-plugin]merging 'master' into 'develop' adds b4ec43d [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 67e7379 From scmwebeditor -- fg adds f14ecbf Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop adds 480ca85 Complete documentation adds df4a2de #8738 Remove ReferenceStationBiometry in documentation # adds 3d59cca Update documentation with right example on esdu cell name adds a3822b1 #8744 DataQuality wasn't copy in export row adds 44d2f2e #8743 Add export biology adds d4eec9d #8743 Fix on specie only to get individual sample adds cfa5f44 Fix error syntax adds 60f4d6c Fix error syntax adds a0738aa Fix title adds 5124323 #8747 Modify SizeCategoryMeaning LengthClassMeaning adds 958a07b [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' with non-snapshot versions adds 66253ff [jgitflow-maven-plugin]merging 'release/4.0.2' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- ...WorkingDbMigrationCallBackForVersion3_912.java} | 6 +- .../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, 499 insertions(+), 120 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_911.java => WorkingDbMigrationCallBackForVersion3_912.java} (89%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.912-0-atlantos-operation.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.912-0-atlantos-operation.sql rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MismatchSizeCategoryMeaningException.java => MismatchLengthCategoryMeaningException.java} (74%) create mode 100644 echobase-services/src/main/resources/actual create mode 100644 echobase-services/src/main/resources/expected -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.