This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 771ce248c673278e5d1c60d9c5ba18c23659c285 Merge: 9492cfe 283c386 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 10:21:18 2015 +0100 [jgitflow-maven-plugin]merging 'release/4.2-rc-1' into 'master' pom.xml | 53 +++++--- .../AllegroCampagne-Specifications.odt | Bin 841456 -> 982028 bytes .../AllegroCampagne-Specifications.pdf | Bin 1494390 -> 1776041 bytes src/site/site_fr.xml | 17 ++- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/README.txt | 4 +- tutti-persistence/pom.xml | 8 +- .../service/TuttiPersistenceServiceLocator.java | 2 +- .../referential/synchro/ReferentialUpdateTask.java | 43 +++---- ...aceReferenceTaxonReferentialUpdateTaskImpl.java | 100 +++++++++++++++ .../TuttiReferentialSynchroServiceImpl.java | 140 +++++++++++++++++++++ .../main/java/fr/ifremer/tutti/util/Weights.java | 8 ++ ...rvice.referential.synchro.ReferentialUpdateTask | 1 + .../src/main/resources/queries-failsafe.hbm.xml | 27 +++- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../service/catches/WeightComputingService.java | 7 +- .../genericformat/GenericFormatExportService.java | 15 +-- .../TuttiReferentialSynchronizeService.java | 4 +- .../resources/i18n/tutti-service_fr_FR.properties | 4 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 22 +++- .../content/home/actions/EditCatchesAction.java | 11 +- .../content/operation/EditFishingOperationUI.css | 7 +- .../operation/FishingOperationsUIHandler.java | 26 ++-- .../CreateBenthosBatchAndContinueAction.java | 3 +- .../SelectSpeciesForBenthosBatchAction.java | 20 ++- .../CreateSpeciesBatchAndContinueAction.java | 2 +- .../SelectSpeciesForSpeciesBatchAction.java | 19 ++- .../fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 7 +- .../ui/swing/util/actions/SimpleActionSupport.java | 28 ++++- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 32 files changed, 480 insertions(+), 108 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.