branch develop updated (b0b5fe7 -> 312d797)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from b0b5fe7 Let's generate the mapping inside the sources new ee8e5a5 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 5e65521 [jgitflow-maven-plugin]updating poms for 5.0-RC-3 branch with snapshot versions new afea68a [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC-3' with non-snapshot versions new 8bffed8 [jgitflow-maven-plugin]merging 'release/5.0-RC-3' into 'master' new e42f35a [jgitflow-maven-plugin]merging 'master' into 'develop' new 312d797 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 312d797a470d317f47c52086977b43e8b2355b05 Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 7 14:34:16 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e42f35a87d710d3d5cc3c9fe56bdfe5e27edfe9f Merge: ee8e5a5 8bffed8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 7 14:34:14 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit ee8e5a53873220c02c06c0d357f20304fa475b50 Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 7 14:34:11 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 8bffed8c63608ba86d24ed35049e5a73b326ef57 Merge: 6bb6c0b afea68a Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 7 14:34:00 2016 +0200 [jgitflow-maven-plugin]merging 'release/5.0-RC-3' into 'master' commit afea68af240cb90501978d6ab98d5b568dc83013 Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 7 14:26:26 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC-3' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit afea68af240cb90501978d6ab98d5b568dc83013 Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 7 14:26:26 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC-3' with non-snapshot versions --- application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 2 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- services/pom.xml | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/application-swing-configuration/pom.xml b/application-swing-configuration/pom.xml index 9a0e0e9..5a39c4e 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index b0924d4..e8a6255 100644 --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 96f044f..736d46e 100644 --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index 8e80e84..6c044fa 100644 --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index b03e5f3..b8969c9 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 41f5f63..6c72aff 100644 --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index d57d9f6..74f0c9e 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 26d718f..2cca6f4 100644 --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index 2e13a86..f90e271 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 7df96e2..e743f6f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 19e6dde..c97b026 100644 --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 6b24540..a558077 100644 --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index 97e7116..04c6113 100644 --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 96f4cda..ff2e5ab 100644 --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 351a9fb..a609182 100644 --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index c7e4cb9..c22d327 100644 --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index fb412f0..4093d37 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index fed6cef..7835298 100644 --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 39388ea..e5cbdd2 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 2a15bf0..3c53b30 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 873433a..a721c63 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 11d2981..faec87a 100644 --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 921a9a4..70648bc 100644 --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index bd816d9..504f05f 100644 --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>topia-templates-extension</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 8bffed8c63608ba86d24ed35049e5a73b326ef57 Merge: 6bb6c0b afea68a Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 7 14:34:00 2016 +0200 [jgitflow-maven-plugin]merging 'release/5.0-RC-3' into 'master' application-swing-configuration/pom.xml | 4 +- application-swing-decoration/pom.xml | 6 +- .../swing/decoration/DecoratorService.java | 6 + .../decorators/ReferentialReferenceDecorator.java | 29 ++- application-swing-validation/pom.xml | 6 +- .../application-swing-validation_fr_FR.properties | 6 +- application-swing-validators/pom.xml | 4 +- application-swing/pom.xml | 156 ++++-------- .../observe/application/swing/ObserveRunner.java | 5 +- .../ObserveSwingApplicationDataSourcesManager.java | 6 +- .../swing/db/ObserveSwingDataSource.java | 6 +- .../ird/observe/application/swing/ui/UIHelper.java | 118 +++++---- .../swing/ui/actions/ReloadStorageAction.java | 4 +- .../shared/MoveActivityLonglinesUIAction.java | 2 +- .../actions/shared/MoveActivitySeinesUIAction.java | 2 +- .../ui/actions/shared/MoveRoutesUIAction.java | 2 +- .../application/swing/ui/admin/AdminUIModel.java | 25 ++ .../synchronize/data/DataSynchroUIHandler.java | 2 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 2 +- .../open/impl/longline/TripLonglineUIHandler.java | 16 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 2 +- .../open/impl/seine/TripSeineUIHandler.java | 16 +- ...rUseFeaturesMeasurementLonglinesTableModel.java | 10 +- .../content/table/impl/seine/CodeMesureEnum.java | 6 + ...GearUseFeaturesMeasurementSeinesTableModel.java | 8 +- .../swing/ui/storage/ObstunaAdminAction.java | 9 +- .../swing/ui/storage/StorageUIHandler.java | 6 +- .../swing/ui/storage/StorageUIModel.java | 6 +- .../swing/ui/storage/tabs/StorageTabUIHandler.java | 7 +- .../actions/ChangeActivityRouteActionListener.java | 2 +- .../actions/ChangeActivityTripActionListener.java | 2 +- .../actions/ChangeRouteTripActionListener.java | 2 +- .../ftl/dataSourceConnectionReport_fr.ftl | 2 +- .../i18n/application-swing_fr_FR.properties | 2 +- application-web-configuration/pom.xml | 4 +- .../ObserveWebApplicationConfiguration.java | 3 + .../db/ObserveWebDatabasesHelper.java | 4 + .../configuration/user/ObserveWebUsersHelper.java | 4 + application-web/pom.xml | 41 +++- .../web/ObserveWebApplicationListener.java | 2 +- .../application/web/ObserveWebMotionFilter.java | 2 +- .../web/controller/v1/ConfigurationController.java | 6 +- .../controller/v1/DataSourceServiceController.java | 4 +- .../ObserveDataSourceConfigurationInjector.java | 2 +- .../web/injector/ObserveDtoInjector.java | 2 +- application-web/src/main/resources/mapping | 192 ++++++++++++++- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 10 +- services-configuration-rest/pom.xml | 4 +- .../ObserveDataSourceConfigurationRest.java | 4 +- ...bserveDataSourceConfigurationRestConstants.java | 2 +- .../ObserveDataSourceConnectionRest.java | 3 +- services-configuration-topia/pom.xml | 4 +- .../ObserveDataSourceConfigurationTopiaH2.java | 2 +- .../ObserveDataSourceConfigurationTopiaPG.java | 2 +- ...ObserveDataSourceConfigurationTopiaSupport.java | 4 +- .../ObserveDataSourceConnectionTopia.java | 3 +- .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 8 +- .../ObserveDataSourceConfiguration.java | 0 ...bserveDataSourceConfigurationAndConnection.java | 0 .../configuration/ObserveDataSourceConnection.java | 0 .../ObserveDataSourceConnectionSupport.java | 0 .../ObserveDataSourceInformation.java | 0 .../configuration/ObserveDataSourceType.java | 0 .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.md | 0 {services-model => services-dto}/pom.xml | 10 +- .../src/license/THIRD-PARTY.properties | 0 .../observe/services/dto/AbstractObserveDto.java | 0 .../observe/services/dto/AbstractReference.java | 0 .../observe/services/dto/AbstractReferenceSet.java | 0 .../fr/ird/observe/services/dto/DataReference.java | 0 .../ird/observe/services/dto/DataReferenceSet.java | 0 .../dto/DataSourceCreateConfigurationDto.java | 0 ...urceCreateWithNoReferentialImportException.java | 0 .../java/fr/ird/observe/services/dto/Form.java | 0 .../java/fr/ird/observe/services/dto/IdDto.java | 0 .../java/fr/ird/observe/services/dto/IdDtos.java | 0 ...ibleDataSourceCreateConfigurationException.java | 0 .../observe/services/dto/ObserveDbUserDtos.java | 0 .../fr/ird/observe/services/dto/ObserveDto.java | 0 .../dto/ObserveSpeciesListConfiguration.java | 0 .../fr/ird/observe/services/dto/ReferenceMap.java | 0 .../dto/ReferenceValueNotFoundException.java | 0 .../services/dto/UnauthorizedException.java | 0 .../services/dto/actions/report/DataMatrix.java | 0 .../services/dto/actions/report/Report.java | 0 .../dto/actions/report/ReportOperation.java | 0 .../services/dto/actions/report/ReportRequest.java | 0 .../dto/actions/report/ReportVariable.java | 0 .../observe/services/dto/constants/GearType.java | 0 .../services/dto/constants/ObserveDbRole.java | 0 .../services/dto/constants/ReferenceStatus.java | 0 .../services/dto/constants/ReferentialLocale.java | 0 .../services/dto/constants/TripMapPointType.java | 0 .../seine/NonTargetCatchComputedValueSource.java | 0 .../services/dto/constants/seine/Ownership.java | 0 .../services/dto/constants/seine/SchoolType.java | 0 .../seine/TypeTransmittingBuoyOperation.java | 0 .../ird/observe/services/dto/gson/BlobAdapter.java | 0 .../observe/services/dto/gson/ClassAdapter.java | 0 .../ird/observe/services/dto/gson/DateAdapter.java | 0 .../ird/observe/services/dto/gson/FormAdapter.java | 0 .../services/dto/gson/ImmutableListAdapter.java | 0 .../services/dto/gson/ImmutableMapAdapter.java | 0 .../dto/gson/ImmutableMultimapAdapter.java | 0 .../services/dto/gson/ImmutableSetAdapter.java | 0 .../observe/services/dto/gson/IntegerAdapter.java | 0 .../services/dto/gson/ObserveDtoGsonSupplier.java | 0 .../dto/gson/ReferentialMultimapAdapter.java | 0 .../services/dto/gson/ReportVariableAdapter.java | 0 .../observe/services/dto/gson/VersionAdapter.java | 0 .../gson/reference/AbstractReferenceAdapter.java | 0 .../reference/AbstractReferenceSetAdapter.java | 0 .../dto/gson/reference/DataReferenceAdapter.java | 0 .../gson/reference/DataReferenceSetAdapter.java | 0 .../reference/ReferentialReferenceAdapter.java | 0 .../reference/ReferentialReferenceSetAdapter.java | 0 .../gson/reference/UnknownReferenceAdapter.java | 0 .../services/dto/longline/ActivityLonglineDto.java | 0 .../dto/longline/BasketWithSectionIdDto.java | 0 .../dto/longline/BranchlineWithBasketIdDto.java | 0 .../GearUseFeaturesMeasurementLonglineDto.java | 0 .../dto/longline/LonglineCompositionDto.java | 0 .../dto/longline/LonglinePositionAwareDto.java | 0 .../dto/longline/LonglinePositionSetDto.java | 0 .../services/dto/longline/SectionTemplate.java | 0 .../services/dto/longline/SectionWithTemplate.java | 0 .../dto/longline/SectionWithTemplates.java | 0 .../longline/SetLonglineGlobalCompositionDto.java | 0 .../dto/reference/DataReferenceSetDefinitions.java | 6 +- .../dto/reference/ReferenceBinderEngine.java | 0 .../reference/ReferenceBinderEngineSupplier.java | 0 .../dto/reference/ReferenceSetDefinition.java | 0 .../ReferentialReferenceSetDefinitions.java | 0 .../request/ReferenceSetRequestDefinition.java | 0 .../request/ReferenceSetRequestDefinitions.java | 0 .../request/ReferenceSetRequestKeyDefinition.java | 0 .../dto/referential/GearCaracteristicTypeDtos.java | 8 +- .../dto/referential/I18nReferentialDto.java | 0 .../dto/referential/I18nReferentialDtos.java | 0 .../services/dto/referential/PersonDtos.java | 0 .../services/dto/referential/ProgramDto.java | 0 .../services/dto/referential/ProgramDtos.java | 0 .../services/dto/referential/ReferentialDto.java | 0 .../services/dto/referential/ReferentialDtos.java | 0 .../dto/referential/ReferentialMultimap.java | 0 .../dto/referential/ReferentialReference.java | 0 .../dto/referential/ReferentialReferenceSet.java | 0 .../dto/referential/ReferentialReferences.java | 0 .../services/dto/referential/SpeciesListDto.java | 0 .../services/dto/referential/VesselDtos.java | 0 .../longline/VesselActivityLonglineDtos.java | 0 .../referential/seine/VesselActivitySeineDtos.java | 0 .../dto/referential/seine/WeightCategoryDtos.java | 0 .../observe/services/dto/result/SaveResultDto.java | 0 .../services/dto/result/SaveResultDtos.java | 0 .../dto/result/TripChildSaveResultDtos.java | 0 .../services/dto/seine/ActivitySeineDto.java | 0 .../services/dto/seine/ActivitySeineStubDto.java | 0 .../dto/seine/DiscardedTargetCatchDto.java | 0 .../dto/seine/DiscardedTargetSampleDto.java | 0 .../seine/FloatingObjectTransmittingBuoyDto.java | 0 .../seine/GearUseFeaturesMeasurementSeineDto.java | 0 .../services/dto/seine/KeptTargetCatchDto.java | 0 .../services/dto/seine/KeptTargetSampleDto.java | 0 .../ird/observe/services/dto/seine/RouteDto.java | 0 .../observe/services/dto/seine/SetSeineDto.java | 0 .../services/dto/seine/TargetCatchDtos.java | 0 .../services/dto/seine/TargetLengthDto.java | 0 .../observe/services/dto/seine/TripSeineDto.java | 0 .../main/java/fr/ird/observe/util/GPSPoint.java | 0 .../main/java/fr/ird/observe/util/ObserveUtil.java | 0 .../xmi/observe-services-dto-common.properties | 0 .../src/main/xmi/observe-services-dto-common.zargo | Bin .../xmi/observe-services-dto-longline.properties | 0 .../main/xmi/observe-services-dto-longline.zargo | Bin .../main/xmi/observe-services-dto-seine.properties | 0 .../src/main/xmi/observe-services-dto-seine.zargo | Bin services-rest/pom.xml | 8 +- .../rest/ObserveDataSourceConnectionAdapter.java | 2 +- .../services/rest/ObserveServiceFactoryRest.java | 43 ++-- .../services/rest/RestTestClassResource.java | 2 +- .../services/rest/RestTestMethodResource.java | 2 +- .../rest/service/AbstractServiceRestTest.java | 2 +- .../rest/service/DataSourceServiceRestTest.java | 2 +- .../services/rest/service/PingServiceRestTest.java | 2 +- .../service/ReferenceValuesSetServiceRestTest.java | 2 +- .../rest/service/ReferentialServiceRestTest.java | 2 +- services-runner/pom.xml | 30 ++- .../ObserveDataSourceConfigurationMainFactory.java | 6 +- services-topia-validation/pom.xml | 6 +- .../services-topia-validation_fr_FR.properties | 6 +- services-topia-validators/pom.xml | 4 +- services-topia/pom.xml | 8 +- .../services/topia/ObserveServiceContextTopia.java | 4 +- .../services/topia/ObserveServiceFactoryTopia.java | 14 +- .../ObserveTopiaApplicationContextFactory.java | 6 +- .../topia/binder/data/SensorUsedBinder.java | 19 +- .../topia/service/DataSourceServiceTopia.java | 8 +- .../service/actions/report/ReportServiceTopia.java | 4 +- .../services/topia/DataSourcesForTestManager.java | 2 +- .../ObserveDataSourceConnectionTopiaTaiste.java | 2 +- .../services/topia/TopiaTestClassResource.java | 2 +- .../services/topia/TopiaTestMethodResource.java | 2 +- .../topia/entity/ReplicateTestSupport.java | 2 +- .../topia/service/DataSourceServiceTopiaTest.java | 2 +- .../observe/services/topia/service/RigthTest.java | 2 +- .../service/actions/report/ReportDcpUsageTest.java | 4 +- {services-api => services}/LICENSE.txt | 0 {services-api => services}/README.md | 0 {services-api => services}/pom.xml | 12 +- .../src/license/THIRD-PARTY.properties | 0 .../src/main/filters/observe-reports.properties | 2 +- .../fr/ird/observe/services/ObserveService.java | 0 .../observe/services/ObserveServiceFactory.java | 0 .../services/ObserveServiceFactorySupport.java | 0 .../services/ObserveServiceInitializer.java | 0 .../observe/services/ObserveServicesProvider.java | 0 .../observe/services/http/ObserveHttpError.java | 0 .../security/AdminApiKeyNotFoundException.java | 0 .../AuthenticationTokenNotFoundException.java | 0 .../BadObserveWebUserPasswordException.java | 0 .../security/InvalidAdminKeyApiException.java | 0 .../InvalidAuthenticationTokenException.java | 0 .../ObserveWebSecurityExceptionSupport.java | 0 .../SecurityRequestContextNotFoundException.java | 0 .../security/UnknownObserveWebUserException.java | 0 .../UnknownObserveWebUserForDatabaseException.java | 0 .../security/UserLoginNotFoundException.java | 0 .../security/UserPasswordNotFoundException.java | 0 .../service/AddSqlScriptProducerRequest.java | 0 .../service/AddSqlScriptProducerResult.java | 0 .../services/service/BabModelVersionException.java | 0 .../service/ConcurrentModificationException.java | 0 .../service/DataFileNotFoundException.java | 0 .../services/service/DataNotFoundException.java | 0 .../services/service/DataSourceService.java | 0 .../DatabaseConnexionNotAuthorizedException.java | 0 .../DatabaseDestroyNotAuthorizedException.java | 0 .../service/DatabaseNotFoundException.java | 0 .../service/DeleteSqlScriptProducerRequest.java | 0 .../services/service/ObserveBlobsContainer.java | 0 .../services/service/ObserveReferentialCache.java | 0 .../ird/observe/services/service/PingService.java | 0 .../services/service/ReferenceSetsRequest.java | 0 .../services/service/ReferentialService.java | 0 .../services/service/SqlScriptProducerService.java | 0 .../ConsolidateActivitySeineDataResult.java | 0 .../consolidate/ConsolidateDataService.java | 0 .../ConsolidateTripSeineDataRequest.java | 0 .../ConsolidateTripSeineDataResult.java | 0 .../service/actions/report/ReportBuilder.java | 0 .../service/actions/report/ReportService.java | 0 .../diff/ReferentialDataSourceState.java | 0 .../diff/ReferentialDataSourceStates.java | 0 .../diff/ReferentialSynchronizeDiff.java | 0 .../diff/ReferentialSynchronizeDiffService.java | 0 .../diff/ReferentialSynchronizeDiffState.java | 0 .../diff/ReferentialSynchronizeDiffStateType.java | 0 .../diff/ReferentialSynchronizeDiffs.java | 0 .../diff/ReferentialSynchronizeDiffsEngine.java | 0 ...ionalReferentialSynchronizeCallbackRequest.java | 0 ...onalReferentialSynchronizeCallbackRequests.java | 0 ...tionalReferentialSynchronizeCallbackResult.java | 0 ...ionalReferentialSynchronizeCallbackResults.java | 0 ...nidirectionalReferentialSynchronizeContext.java | 0 ...UnidirectionalReferentialSynchronizeEngine.java | 0 ...ectionalReferentialSynchronizeLocalService.java | 0 ...nidirectionalReferentialSynchronizeRequest.java | 0 ...UnidirectionalReferentialSynchronizeResult.java | 0 .../ng/ReferentialSynchronizeRequest.java | 0 .../ng/ReferentialSynchronizeService.java | 0 .../ng/ReferentialSynchronizeServiceEngine.java | 0 ...entialSynchronizeServiceProduceSqlsRequest.java | 0 ...rentialSynchronizeServiceProduceSqlsResult.java | 0 .../ng/ReferentialSynchronizeSqlsRequest.java | 0 .../ng/task/ReferentialSynchronizeTask.java | 0 .../ng/task/ReferentialSynchronizeTaskType.java | 0 .../actions/validate/ValidateDataRequest.java | 0 .../actions/validate/ValidateDataResult.java | 0 .../validate/ValidateReferentialsRequest.java | 0 .../validate/ValidateReferentialsResult.java | 0 .../actions/validate/ValidateResultForDto.java | 0 .../actions/validate/ValidateResultForDtoType.java | 0 .../actions/validate/ValidateResultForDtos.java | 0 .../service/actions/validate/ValidateService.java | 0 .../actions/validate/ValidateServiceUtils.java | 0 .../actions/validate/ValidationMessage.java | 0 .../service/actions/validate/ValidatorDto.java | 0 .../service/actions/validate/ValidatorDtos.java | 0 .../validate/ValidatorInitializationException.java | 0 .../longline/ActivityLongLineEncounterService.java | 0 .../ActivityLongLineSensorUsedService.java | 0 .../service/longline/ActivityLonglineService.java | 0 .../service/longline/BranchlineService.java | 0 .../service/longline/SetLonglineCatchService.java | 0 .../SetLonglineDetailCompositionService.java | 0 .../SetLonglineGlobalCompositionService.java | 0 .../service/longline/SetLonglineService.java | 0 .../services/service/longline/TdrService.java | 0 .../longline/TripLonglineGearUseService.java | 0 .../service/longline/TripLonglineService.java | 0 .../seine/ActivitySeineObservedSystemService.java | 0 .../service/seine/ActivitySeineService.java | 0 .../service/seine/FloatingObjectService.java | 0 .../service/seine/NonTargetCatchService.java | 0 .../service/seine/NonTargetSampleService.java | 0 .../seine/ObjectObservedSpeciesService.java | 0 .../service/seine/ObjectSchoolEstimateService.java | 0 .../services/service/seine/RouteService.java | 0 .../service/seine/SchoolEstimateService.java | 0 .../services/service/seine/SetSeineService.java | 0 .../services/service/seine/TargetCatchService.java | 0 .../service/seine/TargetSampleService.java | 0 .../seine/TransmittingBuoyOperationService.java | 0 .../service/seine/TripSeineGearUseService.java | 0 .../services/service/seine/TripSeineService.java | 0 .../services/service/trip/DeleteTripRequest.java | 0 .../services/service/trip/DeleteTripResult.java | 0 .../services/service/trip/ExportTripRequest.java | 0 .../services/service/trip/ExportTripResult.java | 0 .../services/service/trip/ImportTripRequest.java | 0 .../services/service/trip/ImportTripResult.java | 0 .../service/trip/TripManagementService.java | 0 .../fr/ird/observe/services/spi/DeleteRequest.java | 0 .../fr/ird/observe/services/spi/NoDataAccess.java | 0 .../fr/ird/observe/services/spi/PostRequest.java | 0 .../observe/services/spi/ReadDataPermission.java | 0 .../services/spi/ReadReferentialPermission.java | 0 .../java/fr/ird/observe/services/spi/Write.java | 0 .../observe/services/spi/WriteDataPermission.java | 0 .../services/spi/WriteReferentialPermission.java | 0 .../service/actions/report/ReportBuilderTest.java | 0 .../actions/report/observe-reports-test.properties | 0 .../src/test/resources/log4j.properties | 0 test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- .../maven/plugins/toolbox/CheckApiMojo.java | 13 +- .../toolbox/GenerateI18nValidatorFieldsMojo.java | 3 + .../toolbox/GenerateWebmotionMappingMojo.java | 266 +++++++++++++++++++++ topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 347 files changed, 941 insertions(+), 390 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit ee8e5a53873220c02c06c0d357f20304fa475b50 Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 7 14:34:11 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 2 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- services/pom.xml | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/application-swing-configuration/pom.xml b/application-swing-configuration/pom.xml index c21647f..5a39c4e 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index 1e0fe7b..e8a6255 100644 --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index a5767ac..736d46e 100644 --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index 6fbef19..6c044fa 100644 --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 0edab40..b8969c9 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index f66c84f..6c72aff 100644 --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 4c5b755..74f0c9e 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 384cd94..2cca6f4 100644 --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index c8f7b3a..f90e271 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index b2add63..e743f6f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index d7d416d..c97b026 100644 --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index ccfe558..a558077 100644 --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index 4d34f53..04c6113 100644 --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index be919ba..ff2e5ab 100644 --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 6b7a53c..a609182 100644 --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 5b5ea12..c22d327 100644 --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 70268c5..4093d37 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index b4f9f7f..7835298 100644 --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 3aedd7f..e5cbdd2 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 4fe8bad..3c53b30 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 079e777..a721c63 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 3b31161..faec87a 100644 --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 7e4be18..70648bc 100644 --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index 5b26f0d..504f05f 100644 --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-3</version> </parent> <artifactId>topia-templates-extension</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit e42f35a87d710d3d5cc3c9fe56bdfe5e27edfe9f Merge: ee8e5a5 8bffed8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 7 14:34:14 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 312d797a470d317f47c52086977b43e8b2355b05 Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 7 14:34:16 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 2 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- services/pom.xml | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/application-swing-configuration/pom.xml b/application-swing-configuration/pom.xml index 5a39c4e..c21647f 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index e8a6255..1e0fe7b 100644 --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 736d46e..a5767ac 100644 --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index 6c044fa..6fbef19 100644 --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index b8969c9..0edab40 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 6c72aff..f66c84f 100644 --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 74f0c9e..4c5b755 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 2cca6f4..384cd94 100644 --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index f90e271..c8f7b3a 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index e743f6f..b2add63 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index c97b026..d7d416d 100644 --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index a558077..ccfe558 100644 --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index 04c6113..4d34f53 100644 --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index ff2e5ab..be919ba 100644 --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index a609182..6b7a53c 100644 --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index c22d327..5b5ea12 100644 --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 4093d37..70268c5 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 7835298..b4f9f7f 100644 --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index e5cbdd2..3aedd7f 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 3c53b30..4fe8bad 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index a721c63..079e777 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index faec87a..3b31161 100644 --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 70648bc..7e4be18 100644 --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index 504f05f..5b26f0d 100644 --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm