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 15ce292f update doc adds 49e24218 Merge branch 'release/4.2-rc3' into develop adds ef356d01 [gitflow-maven-plugin]Update for next development version adds e5dba0c0 :memo: Update site and site generation adds 06a54571 :memo: Fix gitlab-ci.yml for site generation adds 820c2578 Fix pages build adds edb61645 :memo: update site description adds 13cc0bbf :arrow_up: update parent pom adds cbd53e3f Use target instead of task in maven-antrun-plugin adds db2c1c6a :memo: Add Calibration doc, cf #11014 adds 25065268 :fire: remove useless code adds 2b655da5 :memo: Add Calibration doc (in en version), cf #11014 adds 7d8ffa82 :bug: fixes #11138 : Normalisation du maxTrawlDepth adds f4abc306 :bug: fixes #11190 : Problème de tri sur la colonne id : Force le "ID" en "id" pour permettre le tri (sinon hibernate ne retrouve pas ses petits). adds 719819ae :bug: fixes #11199 : distance en mille nautique au lieu de mètres adds 37824ed1 Update exportAtlantos.rst adds 43a0b528 Update exportAtlantos.rst adds 21ad9bd6 Update exportAtlantos.rst adds 491e90fb Update exportAtlantos.rst adds 998cd0f9 Update index.rst adds dbfc2f4d Update index.rst adds 9de0bc6e Update index.rst adds 4861e350 Update index.rst new 48d4d50f [gitflow-maven-plugin]Update versions for release new b86dabba Merge branch 'release/4.2' The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b86dabba0647d4093448574acef0b1652ff2f380 Merge: 15ce292f 48d4d50f Author: jcouteau <couteau@codelutin.com> Date: Wed Mar 17 14:52:21 2021 +0100 Merge branch 'release/4.2' commit 48d4d50f11c701e82d0a1e30239eda5ff0b3fed4 Author: jcouteau <couteau@codelutin.com> Date: Wed Mar 17 14:44:30 2021 +0100 [gitflow-maven-plugin]Update versions for release Summary of changes: .gitlab-ci.yml | 23 ++++++ echobase-domain/pom.xml | 6 +- echobase-services/pom.xml | 2 +- .../service/atlantos/xml/XmlAccousticExport.java | 2 +- .../service/atlantos/xml/XmlBioticExport.java | 7 +- .../actions/ImportCalibrationActionSupport.java | 5 -- echobase-ui/pom.xml | 2 +- .../ui/actions/AbstractJSONPaginedAction.java | 2 +- pom.xml | 6 +- src/site/en/rst/exportAtlantos.rst | 19 ++--- src/site/en/rst/importData.rst | 47 +++++++++++++ src/site/en/rst/index.rst | 20 +++--- src/site/rst/exportAtlantos.rst | 27 ++++---- src/site/rst/importData.rst | 81 +++++++++++++++++----- src/site/rst/index.rst | 17 ++--- src/site/site_en.xml | 47 ++++--------- src/site/site_fr.xml | 47 +++---------- 17 files changed, 221 insertions(+), 139 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.