branch develop updated (f534e0c -> f6a09f9)
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 f534e0c [jgitflow-maven-plugin]updating poms for 5.1-SNAPSHOT development new 90babd7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 3e852e9 [jgitflow-maven-plugin]updating poms for 5.0 branch with snapshot versions new a40db75 [jgitflow-maven-plugin]updating poms for branch'release/5.0' with non-snapshot versions new 2f84c02 Add missing license headers new 6fbf325 [jgitflow-maven-plugin]merging 'release/5.0' into 'master' new 3d7cd03 [jgitflow-maven-plugin]merging 'master' into 'develop' new f6a09f9 [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 f6a09f9f8449e5aa637472e72ea43c516bdfe3e2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 12 11:27:38 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3d7cd037ce39aac38082f55de9b25d06106da2a4 Merge: 90babd7 6fbf325 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 12 11:27:36 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 90babd786d991eced1bc8af073e6c3029677fd43 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 12 11:27:35 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 6fbf3254806288d6457f0f836652db456c09f1a4 Merge: 8bffed8 2f84c02 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 12 11:27:30 2016 +0200 [jgitflow-maven-plugin]merging 'release/5.0' into 'master' commit 2f84c024a1cb5e4703917768b0560502f9ab1099 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 12 11:26:54 2016 +0200 Add missing license headers commit a40db754c3689ec280a6547084426cb0dd74677c Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 12 10:52:34 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/5.0' with non-snapshot versions Summary of changes: .../v1/LastUpdateDateServiceController.java | 22 ++++++++++++++++++++++ .../topia/service/LastUpdateDateServiceTopia.java | 22 ++++++++++++++++++++++ .../service/TripManagementServiceTopiaTest.java | 22 ++++++++++++++++++++++ .../services/service/LastUpdateDateService.java | 22 ++++++++++++++++++++++ 4 files changed, 88 insertions(+) -- 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 a40db754c3689ec280a6547084426cb0dd74677c Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 12 10:52:34 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/5.0' 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 c21647f..a09af31 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</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index 1e0fe7b..4e908ac 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</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index a5767ac..37d17f0 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</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index 6fbef19..b182da1 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</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 0edab40..05a7826 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</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index f66c84f..d8991c6 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</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 5da30cc..615bbcf 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</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 384cd94..0b5e18f 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</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index 88e54c0..d2fa1cb 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</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 69df214..0b0eadf 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</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index d7d416d..277cc50 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</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index ccfe558..e5e9674 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</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index 4d34f53..6727000 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</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 359f1ec..4ac507b 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</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 6b7a53c..05764d9 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</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 5b5ea12..081e76a 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</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 70268c5..0298aa3 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</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index b4f9f7f..abcaa58 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</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 3aedd7f..19cd1bd 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</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 4fe8bad..8a329c7 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</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 079e777..66a040d 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</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 3b31161..dfca0e5 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</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 7e4be18..d53e719 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</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index 31ebc6f..d638398 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</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 2f84c024a1cb5e4703917768b0560502f9ab1099 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 12 11:26:54 2016 +0200 Add missing license headers --- .../v1/LastUpdateDateServiceController.java | 22 ++++++++++++++++++++++ .../topia/service/LastUpdateDateServiceTopia.java | 22 ++++++++++++++++++++++ .../service/TripManagementServiceTopiaTest.java | 22 ++++++++++++++++++++++ .../services/service/LastUpdateDateService.java | 22 ++++++++++++++++++++++ 4 files changed, 88 insertions(+) diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/LastUpdateDateServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/LastUpdateDateServiceController.java index 7356fb6..016cef6 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/LastUpdateDateServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/LastUpdateDateServiceController.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.web.controller.v1; +/*- + * #%L + * ObServe :: Application Web + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.services.service.LastUpdateDateService; /** diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java index f1ac97d..e297206 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.topia.service; +/*- + * #%L + * ObServe :: Services ToPIA Implementation + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Optional; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.LastUpdateDate; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/TripManagementServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/TripManagementServiceTopiaTest.java index 51517e0..d070dbb 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/TripManagementServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/TripManagementServiceTopiaTest.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.topia.service; +/*- + * #%L + * ObServe :: Services ToPIA Implementation + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.dto.DataReferenceSet; diff --git a/services/src/main/java/fr/ird/observe/services/service/LastUpdateDateService.java b/services/src/main/java/fr/ird/observe/services/service/LastUpdateDateService.java index 82a59dd..7761a7c 100644 --- a/services/src/main/java/fr/ird/observe/services/service/LastUpdateDateService.java +++ b/services/src/main/java/fr/ird/observe/services/service/LastUpdateDateService.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.service; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.services.ObserveService; /** -- 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 6fbf3254806288d6457f0f836652db456c09f1a4 Merge: 8bffed8 2f84c02 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 12 11:27:30 2016 +0200 [jgitflow-maven-plugin]merging 'release/5.0' into 'master' application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- .../swing/decoration/DecoratorService.java | 2 + .../application-swing-decoration_en_GB.properties | 8 +- .../application-swing-decoration_es_ES.properties | 8 +- .../application-swing-decoration_fr_FR.properties | 8 +- application-swing-validation/pom.xml | 2 +- .../application-swing-validation_fr_FR.properties | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- .../swing/ObserveSwingApplicationContext.java | 11 +- .../swing/db/ObserveSwingDataSource.java | 39 +-- .../swing/ui/admin/save/SaveLocalUIHandler.java | 2 +- .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 4 - .../referential/legacy/SynchronizeUIHandler.java | 9 +- .../ReferentialSynchronizeTreeModelsBuilder.java | 61 +++- .../ui/content/impl/seine/FloatingObjectUI.jcss | 2 +- .../swing/ui/content/impl/seine/SetSeineUI.jcss | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 50 +-- .../content/table/impl/seine/AbstractSampleUI.jcss | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 47 ++- .../table/impl/seine/NonTargetSampleUI.jcss | 2 +- .../content/table/impl/seine/TargetSampleUI.jcss | 2 +- .../swing/ui/storage/tabs/StorageTabUIHandler.java | 91 +++++- .../i18n/application-swing_fr_FR.properties | 12 +- ...glineDetailCompositionValidatorServiceTest.java | 3 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 19 +- .../web/ObserveWebApplicationContext.java | 3 +- .../web/ObserveWebApplicationListener.java | 3 +- .../{v1 => }/ConfigurationController.java | 102 +++--- .../v1/LastUpdateDateServiceController.java | 35 +- ...ferentialSynchronizeLocalServiceController.java | 5 + application-web/src/main/resources/mapping | 354 ++++++++++----------- .../4.1/observe-actions-v4.1.ods | Bin 0 -> 34652 bytes doc/tests_fonctionnels/4.1/observe-ecrans-v4.1.ods | Bin 0 -> 97571 bytes .../4.1/observe-sources-donnees-v4.1.ods | Bin 0 -> 27498 bytes .../5.0/observe-actions-v5.0.ods | Bin 0 -> 42800 bytes .../5.0/observe-ecrans-v5.0-local.ods | Bin 0 -> 107069 bytes .../5.0/observe-ecrans-v5.0-serveur.ods | Bin 0 -> 102256 bytes .../5.0/observe-sources-donnees-v5.0.ods | Bin 0 -> 33257 bytes entities-migration/pom.xml | 2 +- .../ObserveMigrationConfigurationProviderImpl.java | 4 +- entities/pom.xml | 136 +++----- entities/src/main/xmi/observe-common.properties | 87 ----- entities/src/main/xmi/observe-longline.properties | 161 ---------- entities/src/main/xmi/observe-seine.properties | 155 --------- entities/src/main/xmi/observe.objectmodel-ext | 248 +++++++++++++++ pom.xml | 7 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- .../configuration/ObserveDataSourceConnection.java | 1 - services-dto/pom.xml | 18 +- .../GearUseFeaturesMeasurementLonglineDto.java | 2 +- .../dto/reference/DataReferenceSetDefinitions.java | 1 - .../request/ReferenceSetRequestDefinitions.java | 1 - .../dto/referential/ReferentialReference.java | 4 + .../seine/GearUseFeaturesMeasurementSeineDto.java | 2 +- .../xmi/observe-services-dto-common.properties | 52 --- .../xmi/observe-services-dto-longline.properties | 123 ------- .../main/xmi/observe-services-dto-seine.properties | 94 ------ .../main/xmi/observe-services-dto.objectmodel-ext | 216 +++++++++++++ services-rest/pom.xml | 2 +- .../services/rest/ObserveServiceFactoryRest.java | 2 +- .../services/rest/http/ObserveResponseBuilder.java | 97 +++--- .../services/rest/RestTestClassResource.java | 3 +- .../services/rest/RestTestMethodResource.java | 6 - services-runner/pom.xml | 2 +- .../services/runner/ObserveServiceMainFactory.java | 37 +-- services-topia-validation/pom.xml | 2 +- ...rvice-objectSchoolEstimate-error-validation.xml | 1 - .../services-topia-validation_fr_FR.properties | 2 +- services-topia-validators/pom.xml | 2 +- .../SetLonglineUniqueHomeIdValidator.java | 4 - .../SetLonglineUniqueNumberValidator.java | 4 - services-topia/pom.xml | 2 +- .../observe/services/topia/ObserveJdbcHelper.java | 2 - .../services/topia/ObserveSecurityHelper.java | 2 - .../services/topia/ObserveServiceContextTopia.java | 1 - .../services/topia/ObserveServiceTopia.java | 100 +----- .../topia/service/DataSourceServiceTopia.java | 5 + .../topia/service/LastUpdateDateServiceTopia.java | 110 +++++++ .../topia/service/ReferentialServiceTopia.java | 15 +- .../service/SqlScriptProducerServiceTopia.java | 13 +- ...nalReferentialSynchronizeLocalServiceTopia.java | 21 +- .../actions/validate/ValidateServiceTopia.java | 5 +- .../ActivityLongLineEncounterServiceTopia.java | 3 +- .../ActivityLongLineSensorUsedServiceTopia.java | 3 +- .../longline/ActivityLonglineServiceTopia.java | 4 +- .../longline/SetLonglineCatchServiceTopia.java | 3 +- .../SetLonglineDetailCompositionServiceTopia.java | 4 +- .../SetLonglineGlobalCompositionServiceTopia.java | 3 +- .../service/longline/SetLonglineServiceTopia.java | 4 +- .../topia/service/longline/TdrServiceTopia.java | 3 +- .../longline/TripLonglineGearUseServiceTopia.java | 4 +- .../service/longline/TripLonglineServiceTopia.java | 4 +- .../ActivitySeineObservedSystemServiceTopia.java | 3 +- .../service/seine/ActivitySeineServiceTopia.java | 4 +- .../service/seine/FloatingObjectServiceTopia.java | 4 +- .../service/seine/NonTargetCatchServiceTopia.java | 4 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 3 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 3 +- .../topia/service/seine/RouteServiceTopia.java | 8 +- .../service/seine/SchoolEstimateServiceTopia.java | 4 +- .../topia/service/seine/SetSeineServiceTopia.java | 7 +- .../TransmittingBuoyOperationServiceTopia.java | 3 +- .../seine/TripSeineGearUseServiceTopia.java | 3 +- .../topia/service/seine/TripSeineServiceTopia.java | 3 +- .../services/topia/TopiaTestClassResource.java | 4 +- .../services/topia/TopiaTestMethodResource.java | 2 +- .../topia/entity/ReplicateTestSupport.java | 2 +- .../service/TripManagementServiceTopiaTest.java | 151 +++++++++ .../UnidirectionalSynchronizeReferentialTest.java | 32 +- .../seine/TargetSampleServiceTopiaTest.java | 16 - services-topia/src/test/resources/log4j.properties | 1 + services/pom.xml | 2 +- .../observe/services/ObserveServiceFactory.java | 3 +- .../services/ObserveServiceInitializer.java | 1 - .../observe/services/ObserveServicesProvider.java | 3 + .../services/service/LastUpdateDateService.java | 21 +- .../services/service/ReferentialService.java | 1 - ...UnidirectionalReferentialSynchronizeEngine.java | 41 ++- ...ectionalReferentialSynchronizeLocalService.java | 5 + .../services/service/trip/DeleteTripRequest.java | 4 +- .../services/service/trip/DeleteTripResult.java | 4 +- .../services/service/trip/ExportTripRequest.java | 4 +- .../services/service/trip/ExportTripResult.java | 3 +- .../services/service/trip/ImportTripRequest.java | 3 +- .../services/service/trip/ImportTripResult.java | 4 +- test/pom.xml | 2 +- .../ird/observe/test/TestClassResourceSupport.java | 2 +- .../resources/db/5.0/dataForTestLongline.sql.gz | Bin 0 -> 1622126 bytes .../main/resources/db/5.0/dataForTestSeine.sql.gz | Bin 0 -> 451053 bytes ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin 0 -> 441245 bytes test/src/main/resources/db/5.0/empty_h2.sql.gz | Bin 0 -> 6016 bytes test/src/main/resources/db/5.0/empty_pg.sql.gz | Bin 0 -> 6006 bytes test/src/main/resources/db/5.0/referentiel.sql.gz | Bin 0 -> 140210 bytes toolbox-maven-plugin/pom.xml | 2 +- .../toolbox/GenerateWebmotionMappingMojo.java | 22 +- topia-extension/pom.xml | 2 +- .../persistence/metadata/TopiaMetadataEntity.java | 71 ++++- .../persistence/metadata/TopiaMetadataModel.java | 2 +- .../metadata/TopiaMetadataModelVisitor.java | 19 ++ .../topia/service/sql/batch/SqlRequests.java | 31 +- .../sql/batch/actions/AbstractSqlAction.java | 1 - .../sql/batch/actions/AbstractTablesAction.java | 38 ++- .../sql/batch/actions/DeleteTablesAction.java | 2 +- .../sql/batch/actions/ReplicateTablesAction.java | 21 +- .../sql/batch/actions/ReplicateTablesRequest.java | 12 + .../sql/batch/actions/UpdateTablesAction.java | 42 ++- .../sql/batch/actions/UpdateTablesRequest.java | 12 + .../service/sql/batch/tables/TopiaSqlTable.java | 16 +- .../service/sql/batch/tables/TopiaSqlTables.java | 15 +- .../sql/batch/tables/TopiaSqlTablesFactory.java | 5 + topia-templates-extension/pom.xml | 6 +- .../templates/TopiaMetadataModelGenerator.java | 133 ++------ 157 files changed, 1802 insertions(+), 1705 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 90babd786d991eced1bc8af073e6c3029677fd43 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 12 11:27:35 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 7835417..a09af31 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index bdcba78..4e908ac 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 6562ce6..37d17f0 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index db46ade..b182da1 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 5884182..05a7826 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 6dda533..d8991c6 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index ee92038..615bbcf 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index a11a8ed..0b5e18f 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index 6623109..d2fa1cb 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 0681b83..0b0eadf 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index aeae421..277cc50 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 02f45bc..e5e9674 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index 61ecb83..6727000 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 6d81c5e..4ac507b 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 6d6e459..05764d9 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 9bad970..081e76a 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index ee6361b..0298aa3 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index ee8ee0d..abcaa58 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 33b8ca7..19cd1bd 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 05c202b..8a329c7 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index ab4b4f9..66a040d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 98758de..dfca0e5 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index d053b63..d53e719 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.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index c18938a..d638398 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.1-SNAPSHOT</version> + <version>5.0</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 3d7cd037ce39aac38082f55de9b25d06106da2a4 Merge: 90babd7 6fbf325 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 12 11:27:36 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../v1/LastUpdateDateServiceController.java | 22 ++++++++++++++++++++++ .../topia/service/LastUpdateDateServiceTopia.java | 22 ++++++++++++++++++++++ .../service/TripManagementServiceTopiaTest.java | 22 ++++++++++++++++++++++ .../services/service/LastUpdateDateService.java | 22 ++++++++++++++++++++++ 4 files changed, 88 insertions(+) -- 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 f6a09f9f8449e5aa637472e72ea43c516bdfe3e2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 12 11:27:38 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 a09af31..7835417 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index 4e908ac..bdcba78 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 37d17f0..6562ce6 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index b182da1..db46ade 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 05a7826..5884182 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index d8991c6..6dda533 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 615bbcf..ee92038 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 0b5e18f..a11a8ed 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index d2fa1cb..6623109 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 0b0eadf..0681b83 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0</version> + <version>5.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 277cc50..aeae421 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index e5e9674..02f45bc 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index 6727000..61ecb83 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 4ac507b..6d81c5e 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 05764d9..6d6e459 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 081e76a..9bad970 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 0298aa3..ee6361b 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index abcaa58..ee8ee0d 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 19cd1bd..33b8ca7 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 8a329c7..05c202b 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 66a040d..ab4b4f9 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index dfca0e5..98758de 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index d53e719..d053b63 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</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index d638398..c18938a 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</version> + <version>5.1-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