branch develop-5.x updated (ffb7ad6 -> 20ace62)
This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from ffb7ad6 [jgitflow-maven-plugin]updating poms for 5.2-SNAPSHOT development new 9dbad90 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 3400a8a [jgitflow-maven-plugin]updating poms for 5.1 branch with snapshot versions new 5db1050 [jgitflow-maven-plugin]updating poms for branch'release/5.1' with non-snapshot versions new f6bbcc2 Add missing license header new 2bd88a9 [jgitflow-maven-plugin]merging 'release/5.1' into 'master-5.x' new 90c5b18 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' new 20ace62 [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 20ace62a249f0e0e0f71d672ffead1592ce57f94 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 5 08:12:18 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 90c5b18094eae50548434d7c7d82dde8dfb2df81 Merge: 9dbad90 2bd88a9 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 5 08:12:16 2016 +0100 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' commit 9dbad90d1962f81fa2bdf3f6136ac524b28a3976 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 5 08:12:15 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 2bd88a9e14088daace67bf19e1033022cf0ba145 Merge: 011e671 f6bbcc2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 5 08:12:09 2016 +0100 [jgitflow-maven-plugin]merging 'release/5.1' into 'master-5.x' commit f6bbcc2e655e16c5a4521c4e5358f986081b57f8 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 5 08:11:37 2016 +0100 Add missing license header commit 5db105050e61e1b68eb085da297cd736045033e3 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 5 07:58:14 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/5.1' with non-snapshot versions Summary of changes: .../ird/observe/services/dto/ObserveModelType.java | 22 ++++++++++++++++++++++ 1 file changed, 22 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-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 5db105050e61e1b68eb085da297cd736045033e3 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 5 07:58:14 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/5.1' 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 bc087d1..76f93d4 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.1</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index bdcba78..24fb60c 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.1</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 6562ce6..545ec17 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.1</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index db46ade..4303a79 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.1</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 88e19be..64dcd60 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.1</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 9f59de7..9ee7891 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.1</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 8e31dc1..cd7fc29 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.1</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index a11a8ed..86785a3 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.1</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index ec5f34c..ba68ac1 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.1</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 7ee9ae8..c2e9a01 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.1</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index aeae421..40073b3 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.1</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 02f45bc..3c9156c 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.1</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index 61ecb83..ec5354d 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.1</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 98564be..20e7a8e 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.1</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 6d6e459..fd04995 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.1</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 9bad970..fb1103e 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.1</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index ee6361b..2c2afae 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.1</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index ee8ee0d..69deb8b 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.1</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 33b8ca7..90ca852 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.1</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 05c202b..645add7 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.1</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index ab4b4f9..6990703 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.1</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 98758de..849e215 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.1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 4255bcd..607e3b6 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.1</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index c18938a..ce6fce9 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.1</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-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit f6bbcc2e655e16c5a4521c4e5358f986081b57f8 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 5 08:11:37 2016 +0100 Add missing license header --- .../ird/observe/services/dto/ObserveModelType.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/ObserveModelType.java b/services-dto/src/main/java/fr/ird/observe/services/dto/ObserveModelType.java index 2dbcf20..46a6630 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/ObserveModelType.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/ObserveModelType.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.dto; +/*- + * #%L + * ObServe :: Services DTO + * %% + * 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% + */ + /** * Created on 27/10/16. * -- 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-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 2bd88a9e14088daace67bf19e1033022cf0ba145 Merge: 011e671 f6bbcc2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 5 08:12:09 2016 +0100 [jgitflow-maven-plugin]merging 'release/5.1' into 'master-5.x' application-swing-configuration/pom.xml | 7 +- .../src/main/config/ObserveSwingApplication.ini | 524 ++++++++++++++ .../src/main/config/ObserveSwingApplication.toml | 601 ---------------- .../ObserveSwingApplicationConfig.java | 90 +-- .../ObserveSwingApplicationConfigAction.java | 142 ---- .../ObserveSwingApplicationConfigOption.java | 780 --------------------- ...pplication-swing-configuration_en_GB.properties | 1 + ...pplication-swing-configuration_es_ES.properties | 1 + ...pplication-swing-configuration_fr_FR.properties | 1 + application-swing-decoration/pom.xml | 2 +- .../swing/decoration/DecoratorService.java | 2 - application-swing-validation/pom.xml | 2 +- ...tsCompositionDto-ui-update-error-validation.xml | 5 - ...CatchLonglineDto-ui-update-error-validation.xml | 5 + ...ksCompositionDto-ui-update-error-validation.xml | 7 +- ...ActivitySeineDto-ui-create-error-validation.xml | 13 + ...tivitySeineDto-ui-create-warning-validation.xml | 21 + ...ActivitySeineDto-ui-update-error-validation.xml | 13 + ...tivitySeineDto-ui-update-warning-validation.xml | 8 +- ...bservedSystemDto-ui-update-error-validation.xml | 63 -- ...ervedSystemDto-ui-update-warning-validation.xml | 50 -- .../application-swing-validation_en_GB.properties | 3 +- .../application-swing-validation_es_ES.properties | 3 +- .../application-swing-validation_fr_FR.properties | 3 +- .../validation/BeanValidatorDetectorTest.java | 6 +- application-swing-validators/pom.xml | 2 +- .../SetLonglineUniqueHomeIdDtoValidator.java | 6 +- .../SetLonglineUniqueNumberDtoValidator.java | 4 +- application-swing/pom.xml | 7 +- application-swing/src/main/assembly/bin.xml | 4 +- application-swing/src/main/assembly/map.xml | 4 +- .../observe/application/swing/ObserveCLAction.java | 6 +- .../application/swing/ObserveOpenDataManager.java | 20 +- .../observe/application/swing/db/DataContext.java | 20 +- .../swing/db/ObserveSwingDataSource.java | 6 - .../application/swing/ui/ObserveCommon.jcss | 1 + .../application/swing/ui/ObserveMainUI.jaxx | 2 +- .../application/swing/ui/ObserveMainUIHandler.java | 2 +- .../ird/observe/application/swing/ui/UIHelper.java | 7 + .../swing/ui/actions/ShowConfigAction.java | 3 +- .../swing/ui/actions/shared/AbstractUIAction.java | 2 +- .../ui/actions/shared/CancelCreateUIAction.java | 2 +- .../swing/ui/actions/shared/CloseOpenUIAction.java | 2 +- .../swing/ui/actions/shared/GoDownUIAction.java | 4 +- .../swing/ui/actions/shared/GoUpUIAction.java | 4 +- .../shared/MoveActivityLonglinesUIAction.java | 4 +- .../actions/shared/MoveActivitySeinesUIAction.java | 4 +- .../ui/actions/shared/MoveRoutesUIAction.java | 4 +- .../swing/ui/actions/shared/MoveTripsUIAction.java | 2 +- .../swing/ui/actions/shared/ReOpenUIAction.java | 2 +- .../ui/actions/shared/SelectNodeUIAction.java | 2 +- .../swing/ui/admin/AdminTabUIHandler.java | 4 - .../application/swing/ui/admin/AdminUIModel.java | 66 +- .../swing/ui/admin/config/SelectDataUI.jaxx | 2 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 13 + .../swing/ui/admin/export/ExportUIHandler.java | 2 +- .../swing/ui/admin/report/ReportConfigUI.jaxx | 15 +- .../swing/ui/admin/report/ReportConfigUI.jcss | 9 + .../swing/ui/admin/report/ReportModel.java | 48 +- .../swing/ui/admin/report/ReportUIHandler.java | 21 +- .../data/DataSynchroSelectionTreeCellRenderer.java | 6 +- .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 2 +- .../validate/ValidateEntityListCellRenderer.java | 6 +- .../swing/ui/admin/validate/ValidateModel.java | 11 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 10 +- .../swing/ui/content/ContentUIHandler.java | 4 +- .../swing/ui/content/ContentUIInitializer.java | 1 + .../swing/ui/content/ContentUIManager.java | 13 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 3 +- .../ui/content/impl/longline/BranchlineUI.jcss | 8 +- .../content/impl/longline/BranchlineUIHandler.java | 57 +- .../content/impl/longline/BranchlineUIModel.java | 12 + .../LonglineDetailCompositionUIHandler.java | 12 +- .../LonglineGlobalCompositionUIHandler.java | 12 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 190 +++-- .../ui/content/impl/longline/SetLonglineUI.jcss | 2 + .../impl/longline/SetLonglineUIHandler.java | 63 +- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 113 --- .../impl/seine/ActivitySeineObservedSystemUI.jcss | 78 --- .../ActivitySeineObservedSystemUIHandler.java | 133 ---- .../seine/ActivitySeineObservedSystemUIModel.java | 42 -- ...ngObjectTransmittingBuoyOperationUIHandler.java | 14 +- .../impl/seine/FloatingObjectUIHandler.java | 6 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 6 +- .../ui/content/list/ContentListUIHandler.java | 4 +- .../ui/content/open/ContentOpenableUIHandler.java | 15 +- .../impl/longline/ActivityLonglineUIHandler.java | 40 +- .../impl/longline/ActivityLonglineUIModel.java | 8 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 4 +- .../open/impl/longline/TripLonglineUIHandler.java | 28 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 58 +- .../content/open/impl/seine/ActivitySeineUI.jcss | 33 + .../open/impl/seine/ActivitySeineUIHandler.java | 32 +- .../open/impl/seine/ActivitySeineUIModel.java | 34 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 18 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 4 +- .../open/impl/seine/TripSeineUIHandler.java | 20 +- .../ui/content/ref/ContentReferenceUIHandler.java | 124 +++- .../ui/content/table/ContentTableUIHandler.java | 2 +- .../impl/GearUseFeatureMeasurementCellEditor.java | 4 +- .../GearUseFeatureMeasurementCellRenderer.java | 4 +- .../impl/longline/BaitsCompositionUIModel.java | 4 +- .../longline/BranchlinesCompositionUIModel.java | 4 +- .../impl/longline/CatchLonglineTableModel.java | 4 +- .../table/impl/longline/CatchLonglineUI.jaxx | 11 +- .../table/impl/longline/CatchLonglineUI.jcss | 18 +- .../impl/longline/CatchLonglineUIHandler.java | 92 ++- .../table/impl/longline/CatchLonglineUIModel.java | 16 + .../table/impl/longline/EncounterUIHandler.java | 4 +- .../table/impl/longline/EncounterUIModel.java | 4 +- .../longline/FloatlinesCompositionUIModel.java | 4 +- .../GearUseFeaturesLonglineTableModel.java | 4 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 8 +- ...rUseFeaturesMeasurementLonglinesTableModel.java | 4 +- .../impl/longline/HooksCompositionUIModel.java | 4 +- .../content/table/impl/longline/SensorUsedUI.jcss | 1 - .../table/impl/longline/SensorUsedUIHandler.java | 35 +- .../table/impl/longline/SensorUsedUIModel.java | 4 +- .../ui/content/table/impl/longline/TdrUI.jcss | 1 - .../content/table/impl/longline/TdrUIHandler.java | 37 +- .../ui/content/table/impl/longline/TdrUIModel.java | 4 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 4 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 4 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 8 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 8 +- .../table/impl/seine/NonTargetCatchUIModel.java | 4 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 4 +- .../table/impl/seine/NonTargetSampleUIModel.java | 4 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 4 +- .../impl/seine/ObjectObservedSpeciesUIModel.java | 4 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 4 +- .../impl/seine/ObjectSchoolEstimateUIModel.java | 4 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 4 +- .../table/impl/seine/SchoolEstimateUIModel.java | 4 +- .../ui/content/table/impl/seine/TargetCatchUI.jcss | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 14 +- .../table/impl/seine/TargetCatchUIModel.java | 4 +- .../table/impl/seine/TargetDiscardCatchUI.jcss | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 16 +- .../impl/seine/TargetDiscardCatchUIModel.java | 4 +- .../table/impl/seine/TargetSampleUIHandler.java | 33 +- .../table/impl/seine/TargetSampleUIModel.java | 4 +- .../swing/ui/storage/tabs/DataSelectionModel.java | 87 ++- .../swing/ui/storage/tabs/RolesTableModel.java | 4 +- .../swing/ui/storage/tabs/SecurityModel.java | 14 +- .../swing/ui/storage/tabs/SelectDataUI.jaxx | 2 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 3 + .../tree/ObserveNavigationTreeShowPopupAction.java | 1 + .../swing/ui/tree/ObserveTreeBridge.java | 1 + .../swing/ui/tree/ObserveTreeHelper.java | 63 ++ .../actions/ChangeActivityRouteActionListener.java | 2 +- .../actions/ChangeActivityTripActionListener.java | 2 +- .../actions/ChangeRouteTripActionListener.java | 2 +- .../actions/ChangeTripProgramActionListener.java | 6 +- .../ui/tree/actions/NodeChangeActionListener.java | 2 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 2 +- .../loadors/ActivityLonglineNodeChildLoador.java | 33 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 4 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 14 +- .../loadors/ActivitySeinesNodeChildLoador.java | 4 +- .../loadors/FloatingObjectNodeChildLoador.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 17 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 17 +- .../ui/tree/loadors/ReferenceNodeChildLoador.java | 10 +- .../swing/ui/tree/loadors/RootNodeChildLoador.java | 6 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 4 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 2 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 2 +- .../MoveActivityLonglineNodeMenuPopulator.java | 8 +- .../menu/MoveActivitySeineNodeMenuPopulator.java | 8 +- .../swing/ui/tree/menu/MoveNodeMenuPopulator.java | 2 +- .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 8 +- .../ui/tree/menu/MoveTripNodeMenuPopulator.java | 12 +- .../{ => node}/AbstrctReferenceNodeSupport.java | 3 +- .../ui/tree/{ => node}/ActivityLonglineNode.java | 3 +- .../ui/tree/{ => node}/ActivitySeineNode.java | 3 +- .../tree/{ => node}/DataReferenceNodeSupport.java | 3 +- .../tree/{ => node}/FloatingObjectSeineNode.java | 3 +- .../swing/ui/tree/{ => node}/ObserveNode.java | 2 +- .../ui/tree/{ => node}/ProgramLonglineNode.java | 19 +- .../swing/ui/tree/{ => node}/ProgramSeineNode.java | 18 +- .../ReferentialReferenceNodeSupport.java | 3 +- .../swing/ui/tree/{ => node}/RouteSeineNode.java | 2 +- .../swing/ui/tree/{ => node}/SetLonglineNode.java | 3 +- .../swing/ui/tree/{ => node}/SetSeineNode.java | 3 +- .../swing/ui/tree/{ => node}/TripLonglineNode.java | 2 +- .../swing/ui/tree/{ => node}/TripSeineNode.java | 14 +- .../AbstractObserveTreeCellRenderer.java | 40 +- .../DataSelectionTreeCellRenderer.java | 4 +- .../{ => renderer}/NavigationTreeCellRenderer.java | 4 +- .../application/swing/ui/usage/UsagesUI.jaxx | 27 +- .../swing/ui/usage/UsagesUIHandler.java | 43 +- .../swing/ui/util/DecoratedNodeEntity.java | 2 +- .../swing/ui/util/tripMap/TripMapUIHandler.java | 6 +- .../i18n/application-swing_en_GB.properties | 13 +- .../i18n/application-swing_es_ES.properties | 13 +- .../i18n/application-swing_fr_FR.properties | 13 +- application-web-configuration/pom.xml | 2 +- .../src/main/config/ObserveWebApplication.ini | 99 +++ .../src/main/config/ObserveWebApplication.toml | 112 --- .../configuration/ObserveWebApplicationConfig.java | 39 +- application-web/pom.xml | 2 +- .../v1/ReferentialServiceController.java | 5 + ...tivitySeineObservedSystemServiceController.java | 49 -- application-web/src/main/resources/mapping | 3 +- .../db/ObserveWebDatabasesHelperTest.java | 51 +- .../user/ObserveWebUsersHelperTest.java | 3 + entities-migration/pom.xml | 2 +- entities/pom.xml | 10 +- .../observe/ObserveTopiaApplicationContext.java | 18 +- .../longline/ActivityLonglineTopiaDao.java | 6 +- .../entities/longline/TripLonglineTopiaDao.java | 32 +- .../entities/seine/ActivitySeineTopiaDao.java | 6 +- .../observe/entities/seine/TargetCatchImpl.java | 4 +- .../ird/observe/entities/seine/TripSeineImpl.java | 10 + .../observe/entities/seine/TripSeineTopiaDao.java | 36 +- entities/src/main/xmi/observe-seine.zargo | Bin 83234 -> 83418 bytes entities/src/main/xmi/observe.ini | 295 ++++++++ entities/src/main/xmi/observe.objectmodel-ext | 248 ------- pom.xml | 28 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 11 +- .../fr/ird/observe/services/dto/DataReference.java | 4 +- .../java/fr/ird/observe/services/dto/IdDto.java | 6 +- .../services/dto/{IdDtos.java => IdHelper.java} | 4 +- ...rveDbUserDtos.java => ObserveDbUserHelper.java} | 2 +- ...8nReferentialDto.java => ObserveModelType.java} | 19 +- .../services/dto/actions/report/Report.java | 20 +- .../services/dto/constants/ReferentialLocale.java | 4 +- .../services/dto/longline/ActivityLonglineDto.java | 2 +- .../GearUseFeaturesMeasurementLonglineDto.java | 2 +- ...mplates.java => SectionWithTemplateHelper.java} | 2 +- .../longline/SetLonglineGlobalCompositionDto.java | 2 +- .../dto/reference/DataReferenceSetDefinitions.java | 45 +- .../request/ReferenceSetRequestDefinitions.java | 8 +- ...eDtos.java => GearCaracteristicTypeHelper.java} | 2 +- .../dto/referential/I18nReferentialDto.java | 2 +- ...rentialDtos.java => I18nReferentialHelper.java} | 3 +- .../{PersonDtos.java => PersonHelper.java} | 2 +- .../services/dto/referential/ProgramDto.java | 2 +- .../{ProgramDtos.java => ProgramHelper.java} | 2 +- .../services/dto/referential/ReferentialDto.java | 2 +- ...ReferentialDtos.java => ReferentialHelper.java} | 2 +- .../services/dto/referential/SpeciesListDto.java | 2 +- .../{VesselDtos.java => VesselHelper.java} | 2 +- ...Dtos.java => VesselActivityLonglineHelper.java} | 4 +- ...ineDtos.java => VesselActivitySeineHelper.java} | 4 +- ...CategoryDtos.java => WeightCategoryHelper.java} | 4 +- .../observe/services/dto/result/SaveResultDto.java | 2 +- .../{SaveResultDtos.java => SaveResultHelper.java} | 2 +- ...ultDtos.java => TripChildSaveResultHelper.java} | 2 +- .../services/dto/seine/ActivitySeineDto.java | 2 +- .../services/dto/seine/ActivitySeineStubDto.java | 2 +- .../seine/FloatingObjectTransmittingBuoyDto.java | 2 +- .../seine/GearUseFeaturesMeasurementSeineDto.java | 2 +- .../ird/observe/services/dto/seine/RouteDto.java | 8 +- .../observe/services/dto/seine/SetSeineDto.java | 2 +- ...TargetCatchDtos.java => TargetCatchHelper.java} | 4 +- .../services/dto/seine/TargetLengthDto.java | 2 +- .../observe/services/dto/seine/TripSeineDto.java | 10 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59520 -> 58913 bytes services-dto/src/main/xmi/observe-services-dto.ini | 265 +++++++ .../main/xmi/observe-services-dto.objectmodel-ext | 216 ------ services-rest/pom.xml | 2 +- .../seine/TripSeineGearUseServiceRestTest.java | 28 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- .../services/topia/ObserveSecurityHelper.java | 6 +- .../services/topia/ObserveServiceTopia.java | 6 +- .../topia/binder/BinderEngineInitializer.java | 234 +++---- .../services/topia/binder/BinderSupport.java | 8 +- .../topia/binder/data/ActivityLonglineBinder.java | 2 + .../topia/binder/data/ActivitySeineBinder.java | 6 + .../data/ActivitySeineObservedSystemDtoBinder.java | 62 -- .../topia/binder/data/DataBinderSupport.java | 8 +- .../FloatingObjectObservedSpeciesDtoBinder.java | 3 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 3 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 3 +- .../topia/binder/data/NonTargetLengthBinder.java | 8 +- .../binder/data/ObjectObservedSpeciesBinder.java | 8 +- .../binder/data/ObjectSchoolEstimateBinder.java | 8 +- .../topia/binder/data/SetLonglineBinder.java | 4 + .../topia/binder/data/TargetSampleBinder.java | 2 +- .../topia/binder/data/TripLonglineBinder.java | 8 +- .../topia/binder/data/TripSeineBinder.java | 8 +- .../topia/service/DataSourceServiceTopia.java | 4 +- .../topia/service/ReferentialServiceTopia.java | 24 + .../topia/service/TripManagementServiceTopia.java | 4 +- .../longline/ActivityLonglineServiceTopia.java | 4 +- .../service/longline/SetLonglineServiceTopia.java | 18 +- .../ActivitySeineObservedSystemServiceTopia.java | 67 -- .../service/seine/ActivitySeineServiceTopia.java | 2 - .../topia/service/seine/RouteServiceTopia.java | 4 +- .../service/seine/TargetCatchServiceTopia.java | 6 +- .../topia/service/seine/TripSeineServiceTopia.java | 9 +- .../topia/binder/BinderEngineMetadataTest.java | 2 +- .../services/topia/binder/BinderEngineTest.java | 2 - .../seine/TripSeineGearUseServiceTopiaTest.java | 6 +- services/pom.xml | 2 +- .../src/main/filters/observe-reports.properties | 31 +- .../observe/services/ObserveServicesProvider.java | 3 - .../services/service/ReferentialService.java | 11 +- .../service/actions/report/ReportBuilder.java | 5 +- ...orDtos.java => ValidateResultForDtoHelper.java} | 2 +- .../{ValidatorDtos.java => ValidatorHelper.java} | 2 +- .../seine/ActivitySeineObservedSystemService.java | 47 -- .../actions/report/observe-reports-test.properties | 2 + test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 14 +- .../sql/batch/actions/ReplicateTablesAction.java | 102 ++- topia-templates-extension/pom.xml | 2 +- .../templates/TopiaMetadataModelGenerator.java | 10 +- 317 files changed, 3369 insertions(+), 4083 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-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 9dbad90d1962f81fa2bdf3f6136ac524b28a3976 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 5 08:12:15 2016 +0100 [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 45bf4b0..76f93d4 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index 7021bfb..24fb60c 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 956fb53..545ec17 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index 977dbbf..4303a79 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index ffc472c..64dcd60 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index abc9a09..9ee7891 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 47626c9..cd7fc29 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 4ad5cb2..86785a3 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index 3ada1e5..ba68ac1 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 6f30653..c2e9a01 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.2-SNAPSHOT</version> + <version>5.1</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 13c1de5..40073b3 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 9d7b734..3c9156c 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index c8dc956..ec5354d 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 169e6ad..20e7a8e 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 976b1ec..fd04995 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 0540ee6..fb1103e 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 757edd8..2c2afae 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 1935dd8..69deb8b 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 650374d..90ca852 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 24cbbd6..645add7 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 9a43343..6990703 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index dad415e..849e215 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 4fc1263..607e3b6 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.2-SNAPSHOT</version> + <version>5.1</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index 84c0493..ce6fce9 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.2-SNAPSHOT</version> + <version>5.1</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-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 90c5b18094eae50548434d7c7d82dde8dfb2df81 Merge: 9dbad90 2bd88a9 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 5 08:12:16 2016 +0100 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' .../ird/observe/services/dto/ObserveModelType.java | 22 ++++++++++++++++++++++ 1 file changed, 22 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-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 20ace62a249f0e0e0f71d672ffead1592ce57f94 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 5 08:12:18 2016 +0100 [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 76f93d4..45bf4b0 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index 24fb60c..7021bfb 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 545ec17..956fb53 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index 4303a79..977dbbf 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 64dcd60..ffc472c 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 9ee7891..abc9a09 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index cd7fc29..47626c9 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 86785a3..4ad5cb2 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index ba68ac1..3ada1e5 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index c2e9a01..6f30653 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1</version> + <version>5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 40073b3..13c1de5 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 3c9156c..9d7b734 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index ec5354d..c8dc956 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 20e7a8e..169e6ad 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index fd04995..976b1ec 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index fb1103e..0540ee6 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 2c2afae..757edd8 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 69deb8b..1935dd8 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 90ca852..650374d 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 645add7..24cbbd6 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 6990703..9a43343 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 849e215..dad415e 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 607e3b6..4fc1263 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</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index ce6fce9..84c0493 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</version> + <version>5.2-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