Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: d93684d4 by Tony CHEMIT at 2017-06-13T19:49:57+02:00 [jgitflow-maven-plugin]updating poms for branch'release/5.4' with non-snapshot versions - - - - - 30ac2ed1 by Tony CHEMIT at 2017-06-13T19:56:05+02:00 reformat code + optimize dependencies - - - - - f1601873 by Tony CHEMIT at 2017-06-13T20:26:25+02:00 [jgitflow-maven-plugin]merging 'release/5.4' into 'master-5.x' - - - - - ed4c99ab by Tony CHEMIT at 2017-06-13T20:26:28+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - f06dc420 by Tony CHEMIT at 2017-06-13T20:26:29+02:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - b92b1481 by Tony CHEMIT at 2017-06-13T20:26:30+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 30 changed files: - entities/pom.xml - entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java - entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java - entities/src/main/java/fr/ird/observe/ObserveTopiaIdFactory.java - entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java - entities/src/main/java/fr/ird/observe/RunScriptTopiaSqlWork.java - entities/src/main/java/fr/ird/observe/RunScriptsTopiaSqlWork.java - entities/src/main/java/fr/ird/observe/entities/Entities.java - entities/src/main/java/fr/ird/observe/entities/EntityMap.java - entities/src/main/java/fr/ird/observe/entities/Trip.java - entities/src/main/java/fr/ird/observe/entities/TripMapPoint.java - entities/src/main/java/fr/ird/observe/entities/gps/CoordinateHelper.java - entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java - entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java - entities/src/main/java/fr/ird/observe/entities/longline/BasketTopiaDao.java - entities/src/main/java/fr/ird/observe/entities/longline/BranchlineImpl.java - entities/src/main/java/fr/ird/observe/entities/longline/BranchlineTopiaDao.java - entities/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java - entities/src/main/java/fr/ird/observe/entities/longline/SectionTopiaDao.java - entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java - entities/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java - entities/src/main/java/fr/ird/observe/entities/longline/TdrTopiaDao.java - entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java - entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java - entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java - entities/src/main/java/fr/ird/observe/entities/referentiel/GearCaracteristicTypes.java - entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java - entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java - entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java - entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/055d730bceca036a2eadc6c12ea... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/055d730bceca036a2eadc6c12ea... You're receiving this email because of your account on gitlab.com.