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 82ccbcac [jgitflow-maven-plugin]merging 'release/4.0.10' into 'master' adds b006f301 [jgitflow-maven-plugin]updating poms for 4.0.11-SNAPSHOT development adds 5083c76c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 229fbd57 [jgitflow-maven-plugin]merging 'master' into 'develop' adds ec61f286 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds b6e1bcbf fixes #9686 adds 4aae35e7 refs #9685 : Acoustic ok, Biotic seems ok (only data pb on my tests) adds 5e10a8e3 refs #9685 : fixes acoustic file adds 09a0e916 fixes #9689 : menus fantomes (Struts 2 pb) adds d3f35f41 refs #9685 : - Add species check for biotic atlantos export icesExport muste be true to export data for this species - do not export data for NA values adds 635d296d From scmwebeditor -- dfsg adds 6c3b103c From scmwebeditor -- dfsg adds 7d201861 From scmwebeditor -- dfsg adds bf8a0610 From scmwebeditor -- dfsg adds 94206441 From scmwebeditor -- dfsg adds 9da22005 From scmwebeditor -- fd adds 33c0f201 Clarify pom adds 42e3fd05 fixes #9717 : Le champ "LengthClass" des lignes "biology" ne devrait pas être égal à zéro dans l'export biotic CIEM adds 287734f5 Improve Biotic ICES export adds ed19cfcc fixes #9737 : Le champ "Frequency" n'est pas bien renseigné dans le chapitre "Instrument" de l'export acoustic adds d508d1fd Should fix biotic export adds c3a6849a Fix release ... adds 5aa7e6a1 [jgitflow-maven-plugin]updating poms for branch'release/4.0.11' with non-snapshot versions adds 09adaa3a [jgitflow-maven-plugin]merging 'release/4.0.11' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- ...WorkingDbMigrationCallBackForVersion3_913.java} | 15 +- ...dd-indexes.sql => 3.913-0-atlantos-species.sql} | 5 +- .../3.913-0-atlantos-species.sql} | 5 +- .../3.913-0-atlantos-species.sql} | 5 +- echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 100351 -> 100538 bytes echobase-services/pom.xml | 2 +- .../service/atlantos/xml/VocabularyExport.java | 2 + .../service/atlantos/xml/XmlAccousticExport.java | 45 ++- .../service/atlantos/xml/XmlBioticExport.java | 410 ++++++++++++++------- ...yageCatchesBiometrySampleImportExportModel.java | 3 + .../atlantos/ExportAtlantosServiceTest.java | 3 +- .../service/importdb/ImportDbServiceTest.java | 3 +- echobase-ui/pom.xml | 2 +- .../resources/i18n/echobase-ui_fr_FR.properties | 2 +- pom.xml | 10 +- src/site/en/rst/importData.rst | 7 + src/site/rst/importData.rst | 9 +- 19 files changed, 355 insertions(+), 177 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_902.java => WorkingDbMigrationCallBackForVersion3_913.java} (78%) copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => 3.913-0-atlantos-species.sql} (87%) copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => h2/3.913-0-atlantos-species.sql} (87%) copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => pg/3.913-0-atlantos-species.sql} (87%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.