This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from e1c2560 nettoyage du site technique (tout ce qui est dans les spécs n'ont plus rien à faire ici) adds 29c4f6e [jgitflow-maven-plugin]updating poms for 4.0.1-SNAPSHOT development adds 332c7d0 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds ce459b7 Merge branch 'master' into develop adds 13e580b [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 6853017 ajout du document de specs dans la release complete et sur le site adds 9bffba4 nettoyage du site technique (tout ce qui est dans les spécs n'ont plus rien à faire ici) adds 8a74ea2 Ne pas accepter un import de taxon si le referenceTaxonId est null (refs #7047) adds 0a7c92e fixes #7047: [IMPORT GENERIQUE] erreur si le referenceTaxonId n'est pas renseigné dans le fichier d'import des taxon. Merge branch 'feature/7047' into develop adds 08e2db7 correction traduction (refs #7058) adds fcda3ba ajout de controle pour valider le dénombrement sur une mensuration mais aussi un poids de mensuration différent de Zéro (refs #7058) adds 8b4f025 fixes #7058: [IMPORT GENERIQUE] Erreur lors de la suppression des poids en double Merge branch 'feature/7058' into develop adds 551cc84 add missing license headers adds 09eb96d [jgitflow-maven-plugin]updating poms for branch'release/4.0.1' with non-snapshot versions adds d69a3c6 Merge branch 'release/4.0.1' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../resources/i18n/tutti-persistence_fr_FR.properties | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../genericformat/consumer/CsvConsumerForCatch.java | 19 +++++++++++++++++++ ...on.java => FrequencyWeigthNullValueException.java} | 13 ++++++------- ...a => MissingBatchNumberForFrequencyException.java} | 13 ++++++------- .../consumer/CsvConsumerForTemporarySpecies.java | 10 ++++++++-- .../resources/i18n/tutti-service_en_GB.properties | 3 +++ .../resources/i18n/tutti-service_fr_FR.properties | 3 +++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 14 files changed, 53 insertions(+), 24 deletions(-) copy tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/{FishingOperationAlreadyImportedException.java => FrequencyWeigthNullValueException.java} (72%) copy tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/{FishingOperationAlreadyImportedException.java => MissingBatchNumberForFrequencyException.java} (72%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.