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 ee34b5c [jgitflow-maven-plugin]merging 'release/4.0.3' into 'master' adds dcc7be1 [jgitflow-maven-plugin]updating poms for 4.0.4-SNAPSHOT development adds 2404ea5 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e75d107 [jgitflow-maven-plugin]merging 'master' into 'develop' adds df43230 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds b539e1d #8763 Fix column name and data quality adds 8229599 #8766 Fix order in map adds 5e22537 #8768 Fix data quality and cellule duplication adds c886450 #8173 Corrections adds 8e5d035 #8173 Corrections adds 53bf52b Correct export atlantos adds ef5deef Fix unique sample adds 7ce55d5 Fix error in vocabulary adds 052f86e Fix error in vocabulary adds 15e0c62 Fix NPE during test adds cff9512 Change the default value adds 8c54c7f [jgitflow-maven-plugin]updating poms for branch'release/4.0.4' with non-snapshot versions adds 3ce9034 [jgitflow-maven-plugin]merging 'release/4.0.4' into 'master' No new revisions were added by this update. Summary of changes: 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>.