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 be377dde [jgitflow-maven-plugin]merging 'release/4.0.13' into 'master' adds 16bbbae4 [jgitflow-maven-plugin]updating poms for 4.0.14-SNAPSHOT development adds ecfafdda [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 66b830e8 [jgitflow-maven-plugin]merging 'master' into 'develop' adds ccb6a0b2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds b4ecf781 Fix subsamples import adds 68d3b25b refs #9685 : fixes biotic ICES export fixes #9735 fixes #9734 fixes #9714 adds 3653682f fixes #9736: Il n'y a que des données associées au SaCategory "D4" dans l'export acoustic adds 24614be9 Update postgres version to avoid missing am.amcanorder column bug on postgres server >=9.6 adds 4cc27889 fixes #9687 : La suppression d'un voyage/transit/transect ne fonctionne pas. adds 016cd029 fixes #9774 : Décalage dans ESDUs auxquels sont attribués les résultats NASC par echotypes en base et dans l'export xml acoustic adds 1083a949 fixes #9778 : Les latitudes et longitudes des logs du fichier acoustic sont égales à zéro adds 1dd70771 fixes #9685 : Les fichiers xml biotic et acoustic de thalassa PELGAS2015 ne s'importent plus dans le portail ICES adds f2878178 [jgitflow-maven-plugin]updating poms for branch'release/4.0.14' with non-snapshot versions adds 90365d28 [jgitflow-maven-plugin]merging 'release/4.0.14' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- .../service/atlantos/xml/XmlAccousticExport.java | 20 ++++--- .../service/atlantos/xml/XmlBioticExport.java | 64 +++++++++++++++++----- .../VoyageCatchesSubSampleImportAction.java | 2 +- .../strategy/CommonAllRemoveDataStrategy.java | 37 +++++++++++++ echobase-ui/pom.xml | 2 +- pom.xml | 4 +- 8 files changed, 106 insertions(+), 27 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.