- Echobase-commits - mailman.cloud.codelutin.com

branch develop updated (9941b726 -> c96c087a)
by codelutin.com scm 01 Mar '18

01 Mar '18

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 9941b726 fixes #9743 : Pb avec sizeCategory à l'import des données biometry new c96c087a [jgitflow-maven-plugin]updating poms for 4.0.13-SNAPSHOT development The 1 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 c96c087af76f0743fcfa9b8b477d3f57a050c0e3 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 1 17:09:51 2018 +0100 [jgitflow-maven-plugin]updating poms for 4.0.13-SNAPSHOT development Summary of changes: echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (69901f81 -> 9941b726)
by codelutin.com scm 01 Mar '18

01 Mar '18

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 69901f81 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop new 9941b726 fixes #9743 : Pb avec sizeCategory à l'import des données biometry The 1 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 9941b726123cc91b40933f7ad2aa91dd7d0e8c3c Author: Jean Couteau <jean.couteau(a)gmail.com> Date: Thu Mar 1 17:05:26 2018 +0100 fixes #9743 : Pb avec sizeCategory à l'import des données biometry Summary of changes: .../csv/VoyageCatchesBiometrySampleImportExportModel.java | 2 +- .../csv/VoyageCatchesBiometrySampleImportRow.java | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (edba46a7 -> 69901f81)
by codelutin.com scm 01 Mar '18

01 Mar '18

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from edba46a7 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new ac96e1e5 remove system.out new 9d328e22 fixes #9740 : "CalibrationID" non renseigné dans le chapitre Samples" de l'export acoustic new 69901f81 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop The 3 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 69901f815adbb97a0cb8d0650fe085bbef1a2742 Merge: 9d328e22 edba46a7 Author: Jean Couteau <jean.couteau(a)gmail.com> Date: Thu Mar 1 15:48:09 2018 +0100 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop commit 9d328e220289c40f0b5e48cf9fb7feb2135d317f Author: Jean Couteau <jean.couteau(a)gmail.com> Date: Thu Mar 1 15:35:23 2018 +0100 fixes #9740 : "CalibrationID" non renseigné dans le chapitre Samples" de l'export acoustic commit ac96e1e56c7efc9b8d121c0cc316a36807f4965c Author: Jean Couteau <jean.couteau(a)gmail.com> Date: Thu Mar 1 15:12:15 2018 +0100 remove system.out Summary of changes: .../services/service/atlantos/xml/XmlAccousticExport.java | 11 +++++++++-- .../services/service/atlantos/xml/XmlBioticExport.java | 6 ------ 2 files changed, 9 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch release/4.0.11 deleted (was 5aa7e6a1)
by codelutin.com scm 01 Mar '18

01 Mar '18

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0.11 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git was 5aa7e6a1 [jgitflow-maven-plugin]updating poms for branch'release/4.0.11' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag echobase-4.0.11 created (now 07d23073)
by codelutin.com scm 01 Mar '18

01 Mar '18

This is an automated email from the git hooks/post-receive script. New change to annotated tag echobase-4.0.11 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 07d23073 (tag) tagging 09adaa3ae6dfd2d0569a6fb6be4f263e0a1e662a (commit) replaces echobase-4.0.10 tagged by Maven Release on Thu Mar 1 15:02:37 2018 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0.11 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/4.0.11 updated (d508d1fd -> 5aa7e6a1)
by codelutin.com scm 01 Mar '18

01 Mar '18

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0.11 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 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 No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- .../WorkingDbMigrationCallBackForVersion3_913.java | 23 +++++++++++++++++++++- .../workingDb/3.913-0-atlantos-species.sql | 22 ++++++++++++++++++++- .../workingDb/h2/3.913-0-atlantos-species.sql | 22 ++++++++++++++++++++- .../workingDb/pg/3.913-0-atlantos-species.sql | 22 ++++++++++++++++++++- echobase-services/pom.xml | 2 +- .../atlantos/ExportAtlantosServiceTest.java | 3 ++- .../service/importdb/ImportDbServiceTest.java | 3 ++- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 93 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (82ccbcac -> 09adaa3a)
by codelutin.com scm 01 Mar '18

01 Mar '18

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(a)codelutin.com>.

1 0

branch develop updated (cee0db18 -> edba46a7)
by codelutin.com scm 01 Mar '18

01 Mar '18

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from cee0db18 [jgitflow-maven-plugin]updating poms for 4.0.12-SNAPSHOT development new beebb3a1 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new c3a6849a Fix release ... new 5aa7e6a1 [jgitflow-maven-plugin]updating poms for branch'release/4.0.11' with non-snapshot versions new 09adaa3a [jgitflow-maven-plugin]merging 'release/4.0.11' into 'master' new 54c99239 [jgitflow-maven-plugin]merging 'master' into 'develop' new edba46a7 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 edba46a7effb653462cacac447924eb493eca676 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 1 15:02:40 2018 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 54c9923942dd98c216d19aa9221293721a86532c Merge: beebb3a1 09adaa3a Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 1 15:02:40 2018 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit beebb3a11cefc9a571103fc9e800bdea955757cd Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 1 15:02:39 2018 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 09adaa3ae6dfd2d0569a6fb6be4f263e0a1e662a Merge: 82ccbcac 5aa7e6a1 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 1 15:02:36 2018 +0100 [jgitflow-maven-plugin]merging 'release/4.0.11' into 'master' commit 5aa7e6a198c33bd95e56f2431622caf71e570a8e Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 1 14:57:31 2018 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.11' with non-snapshot versions commit c3a6849afdc58743363948356c0208f1d750a9aa Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 1 14:56:21 2018 +0100 Fix release ... Summary of changes: .../WorkingDbMigrationCallBackForVersion3_913.java | 23 +++++++++++++++++++++- .../workingDb/3.913-0-atlantos-species.sql | 22 ++++++++++++++++++++- .../workingDb/h2/3.913-0-atlantos-species.sql | 22 ++++++++++++++++++++- .../workingDb/pg/3.913-0-atlantos-species.sql | 22 ++++++++++++++++++++- .../atlantos/ExportAtlantosServiceTest.java | 3 ++- .../service/importdb/ImportDbServiceTest.java | 3 ++- 6 files changed, 89 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

02/06: [jgitflow-maven-plugin]updating poms for branch'release/4.0.11' with non-snapshot versions
by codelutin.com scm 01 Mar '18

01 Mar '18

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 5aa7e6a198c33bd95e56f2431622caf71e570a8e Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 1 14:57:31 2018 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.11' with non-snapshot versions --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index bfb644ac..9613a2bf 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.11-SNAPSHOT</version> + <version>4.0.11</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index eb483c21..1dc9c4fe 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.11-SNAPSHOT</version> + <version>4.0.11</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index feee9168..b721c37f 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.11-SNAPSHOT</version> + <version>4.0.11</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 3ad903cd..5371a0cc 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.11-SNAPSHOT</version> + <version>4.0.11</version> <modules> <module>echobase-domain</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - EchoBase 4.0.11 released
by codelutin.com Release Notification 01 Mar '18

01 Mar '18

The EchoBase team is pleased to announce the echobase-4.0.11 release! The French Institute for the Exploitation of the Sea (Ifremer) has designed an open software suite for storing fisheries acoustic data and computing acoustic indicators for survey-based ecosystem monitoring. It comprises a postgreSQL database designed to store acoustic, navigation and fishing data from ecosystemic surveys (EchoBase) and a suite of R codes (EchoR) for computing fish population indicators based on Echobase data. Documentation of the project can be found here: http://echobase.codelutin.com Changes ------- Changes in this version include: Fixed Bugs: o Le champ "Frequency" n'est pas bien renseigné dans le chapitre "Instrument" de l'export acoustic Issue: 9737. Thanks to Mathieu Doray. Resolved by jcouteau. o Tous les "LengthClass" sont égaux à zéro dans l'export biotic biology alors qu'ils devraient être égaux au sampleData "LTcm" Issue: 9726. Thanks to Mathieu Doray. Resolved by mdoray. o Problèmes d'arrondis dans l'export CIEM Issue: 9729. Thanks to Mathieu Doray. Resolved by jcouteau. o Quelques "SpeciesCategoryNumber" et "SpeciesCategoryWeight" erronés dans l'export biotic Issue: 9730. Thanks to Mathieu Doray. Resolved by jcouteau. o Pas d'Id unique pour les données de biometry dans EchoBase (et donc dans l'export CIEM) Issue: 9718. Thanks to Mathieu Doray. Resolved by jcouteau. o Le champ "LengthClass" des lignes "biology" ne devrait pas être égal à zéro dans l'export biotic CIEM Issue: 9717. Thanks to Mathieu Doray. Resolved by jcouteau. o menus fantomes apparaissent dans menu import résultats (cf PJ) Issue: 9689. Thanks to Mathieu Doray. Resolved by jcouteau. o Erreur pas explicite lors de l'import de totalSamples Issue: 9684. Thanks to Mathieu Doray. Resolved by jcouteau. o Lien " Comment utiliser une application embarquée" cassé sur page création base embarquée Issue: 8830. Thanks to Mathieu Doray. Resolved by jcouteau. o Fautes orthographe dans interface import données acoustiques Issue: 9686. Thanks to Mathieu Doray. Resolved by mdoray. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/echobase/files * echobase-embedded-4.0.11.zip - https://forge.codelutin.com/attachments/download/5060 * echobase-referentiel-4.0.11.echobase - https://forge.codelutin.com/attachments/download/5061 * echobase-ui-4.0.11-full.war - https://forge.codelutin.com/attachments/download/5062 * echobase-ui-4.0.11-lizmap.zip - https://forge.codelutin.com/attachments/download/5063 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository https://nexus.nuiton.org/nexus/content/repositories/other-releases/ Have fun! -EchoBase team

1 0