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 963538e [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development new c76022d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 18dcbff [jgitflow-maven-plugin]updating poms for 4.0-alpha-1 branch with snapshot versions new 2aa41ea [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-1' with non-snapshot versions new fae7167 Add missing license header new 1e14261 [jgitflow-maven-plugin]merging 'release/4.0-alpha-1' into 'master' new 442f0fd [jgitflow-maven-plugin]merging 'master' into 'develop' new a456593 [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 a456593d37bc95df4962b729211dda76e157a47d Author: Maven Release <maven-release@codelutin.com> Date: Fri May 13 09:11:28 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 442f0fd61dedcc91a7466250a3c018a8dc5b43bd Merge: c76022d 1e14261 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 13 09:11:27 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit c76022d26838627512f704e6ed211dff92f5e3ae Author: Maven Release <maven-release@codelutin.com> Date: Fri May 13 09:11:27 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 1e14261aa0f9d49e704b49dbfa6565f5401d6653 Merge: 21f7034 fae7167 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 13 09:11:24 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-1' into 'master' commit fae716762de64170e14655e68eecc8c0a7d9303f Author: Maven Release <maven-release@codelutin.com> Date: Fri May 13 09:11:07 2016 +0200 Add missing license header commit 2aa41ea8111d33fad366a1426393791acacad81a Author: Maven Release <maven-release@codelutin.com> Date: Fri May 13 09:08:06 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-1' with non-snapshot versions Summary of changes: .../fr/ifremer/echobase/entities/DriverType.java | 4 ++-- .../EchoBaseInternalTopiaApplicationContext.java | 21 +++++++++++++++++++++ .../echobase/entities/ImportFileIdTopiaDao.java | 21 +++++++++++++++++++++ .../echobase/entities/ImportFileTopiaDao.java | 21 +++++++++++++++++++++ .../echobase/entities/ImportLogTopiaDao.java | 21 +++++++++++++++++++++ .../fr/ifremer/echobase/entities/ImportedCell.java | 21 +++++++++++++++++++++ .../echobase/entities/ImportedCellResult.java | 21 +++++++++++++++++++++ .../echobase/entities/ImportedSampleDataResult.java | 21 +++++++++++++++++++++ .../fr/ifremer/echobase/entities/data/DataImpl.java | 21 +++++++++++++++++++++ .../fr/ifremer/echobase/entities/data/Datas.java | 21 +++++++++++++++++++++ .../entities/data/GearMetadataValueImpl.java | 21 +++++++++++++++++++++ .../entities/data/OperationMetadataValueImpl.java | 21 +++++++++++++++++++++ .../echobase/entities/data/SampleDataImpl.java | 21 +++++++++++++++++++++ .../ifremer/echobase/entities/data/SampleDatas.java | 21 +++++++++++++++++++++ .../ifremer/echobase/entities/data/SampleImpl.java | 21 +++++++++++++++++++++ .../echobase/entities/references/GearImpl.java | 21 +++++++++++++++++++++ .../echobase/persistence/EchoBaseEntityHelper.java | 4 ++-- .../MigrationCallBackForVersionSupport.java | 21 +++++++++++++++++++++ .../migration/MigrationCallbackSupport.java | 21 +++++++++++++++++++++ .../InternalDbMigrationCallBackForVersion2_2.java | 4 ++-- .../internalDb/InternalDbMigrationCallback.java | 4 ++-- .../WorkingDbMigrationCallBackForVersion3_901.java | 21 +++++++++++++++++++++ .../WorkingDbMigrationCallBackForVersion3_902.java | 21 +++++++++++++++++++++ .../WorkingDbMigrationCallBackForVersion3_903.java | 21 +++++++++++++++++++++ .../workingDb/3.901-0-clean-importLog-table.sql | 20 ++++++++++++++++++++ .../3.902-0-add-SpeciesCategory_lengthClass.sql | 20 ++++++++++++++++++++ .../migration/workingDb/h2/3.900-0-fix-types.sql | 20 ++++++++++++++++++++ .../h2/3.901-1-upgrade-importFile-table.sql | 20 ++++++++++++++++++++ .../workingDb/h2/3.903-0-add-naturalIds.sql | 20 ++++++++++++++++++++ .../migration/workingDb/pg/3.900-0-fix-types.sql | 20 ++++++++++++++++++++ .../workingDb/pg/3.903-0-add-naturalIds.sql | 20 ++++++++++++++++++++ .../echobase/services/csv/BatchCsvExport.java | 21 +++++++++++++++++++++ .../fr/ifremer/echobase/services/csv/CellAble.java | 21 +++++++++++++++++++++ .../ifremer/echobase/services/csv/ResultAble.java | 21 +++++++++++++++++++++ .../echobase/services/csv/ResultValueGetter.java | 21 +++++++++++++++++++++ .../echobase/services/csv/ResultValueSetter.java | 21 +++++++++++++++++++++ .../services/csv/ValueFormatterByFunction.java | 21 +++++++++++++++++++++ .../service/importdata/AgeCategoryCache.java | 21 +++++++++++++++++++++ .../service/importdata/CheckFileException.java | 21 +++++++++++++++++++++ .../DuplicatedEchotypeAssociationException.java | 21 +++++++++++++++++++++ ...uplicatedResultsVoyageLengthAgeKeyException.java | 21 +++++++++++++++++++++ ...icatedResultsVoyageLengthWeightKeyException.java | 21 +++++++++++++++++++++ .../service/importdata/ImportDataFileResult.java | 21 +++++++++++++++++++++ .../service/importdata/ImportDataResult.java | 21 +++++++++++++++++++++ .../service/importdata/ImportDataService.java | 21 +++++++++++++++++++++ .../MismatchAgeCategoryMeaningException.java | 21 +++++++++++++++++++++ .../MismatchSizeCategoryMeaningException.java | 21 +++++++++++++++++++++ .../service/importdata/MismatchVoyageException.java | 21 +++++++++++++++++++++ .../service/importdata/ResultCategoryCache.java | 21 +++++++++++++++++++++ .../service/importdata/SizeCategoryCache.java | 21 +++++++++++++++++++++ .../service/importdata/SpeciesCategoryCache.java | 21 +++++++++++++++++++++ .../importdata/actions/ImportDataActionSupport.java | 21 +++++++++++++++++++++ .../actions/VoyageAcousticsImportAction.java | 21 +++++++++++++++++++++ .../VoyageAcousticsImportDataActionSupport.java | 21 +++++++++++++++++++++ .../VoyageCatchesBiometrySampleImportAction.java | 21 +++++++++++++++++++++ .../VoyageCatchesImportDataActionSupport.java | 21 +++++++++++++++++++++ .../actions/VoyageCatchesSubSampleImportAction.java | 21 +++++++++++++++++++++ .../VoyageCatchesTotalSampleImportAction.java | 21 +++++++++++++++++++++ .../VoyageCommonsImportDataActionSupport.java | 21 +++++++++++++++++++++ .../actions/VoyageCommonsTransectImportAction.java | 21 +++++++++++++++++++++ .../actions/VoyageCommonsTransitImportAction.java | 21 +++++++++++++++++++++ .../actions/VoyageCommonsVoyageImportAction.java | 21 +++++++++++++++++++++ .../VoyageOperationsGearMetadataImportAction.java | 21 +++++++++++++++++++++ .../VoyageOperationsImportDataActionSupport.java | 21 +++++++++++++++++++++ .../VoyageOperationsOperationImportAction.java | 21 +++++++++++++++++++++ ...yageOperationsOperationMetadataImportAction.java | 21 +++++++++++++++++++++ .../VoyageResultsCellImportDataActionSupport.java | 21 +++++++++++++++++++++ ...AndSpeciesCategoryAndLengthCellImportAction.java | 21 +++++++++++++++++++++ ...yEchotypeAndSpeciesCategoryCellImportAction.java | 21 +++++++++++++++++++++ ...VoyageResultsEsduByEchotypeCellImportAction.java | 21 +++++++++++++++++++++ ...tsEsduSpeciesAndAgeCategoryCellImportAction.java | 21 +++++++++++++++++++++ .../VoyageResultsImportDataActionSupport.java | 21 +++++++++++++++++++++ .../VoyageResultsMapFishCellImportAction.java | 21 +++++++++++++++++++++ .../VoyageResultsMapOtherCellImportAction.java | 21 +++++++++++++++++++++ .../VoyageResultsRegionAssociationImportAction.java | 21 +++++++++++++++++++++ .../actions/VoyageResultsRegionImportAction.java | 21 +++++++++++++++++++++ .../VoyageResultsRegionResultsImportAction.java | 21 +++++++++++++++++++++ .../VoyageResultsVoyageEchotypeImportAction.java | 21 +++++++++++++++++++++ ...VoyageResultsVoyageLengthAgeKeyImportAction.java | 21 +++++++++++++++++++++ ...ageResultsVoyageLengthWeightKeyImportAction.java | 21 +++++++++++++++++++++ .../contexts/ImportDataContextSupport.java | 21 +++++++++++++++++++++ .../contexts/VoyageAcousticsImportDataContext.java | 21 +++++++++++++++++++++ .../contexts/VoyageCatchesImportDataContext.java | 21 +++++++++++++++++++++ .../contexts/VoyageCommonsImportDataContext.java | 21 +++++++++++++++++++++ .../contexts/VoyageImportDataContextSupport.java | 21 +++++++++++++++++++++ .../contexts/VoyageOperationsImportDataContext.java | 21 +++++++++++++++++++++ .../contexts/VoyageResultsImportDataContext.java | 21 +++++++++++++++++++++ .../csv/EchoBaseImportExportModelSupport.java | 21 +++++++++++++++++++++ .../i18n/echobase-services_en_GB.properties | 8 ++++---- .../i18n/echobase-services_fr_FR.properties | 10 +++++----- .../echobase/services/ImportDataFixtures.java | 21 +++++++++++++++++++++ 91 files changed, 1795 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.