branch develop-5.x updated (54648e1 -> 49ffee3)
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 54648e1 [stack] use last stable of topia new 54df419 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b2dd0c1 [jgitflow-maven-plugin]updating poms for 5.1.2 branch with snapshot versions new 57eaede [jgitflow-maven-plugin]updating poms for branch'release/5.1.2' with non-snapshot versions new 9094028 Add missing license header new 1e828f8 [jgitflow-maven-plugin]merging 'release/5.1.2' into 'master-5.x' new 0d25efb [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' new 49ffee3 [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 49ffee388f12eb5879a3abf0b0183fb2ce213fd1 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 12 11:04:58 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 0d25efb1a8018fe220a3016ceddab01ca682ebeb Merge: 54df419 1e828f8 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 12 11:04:57 2016 +0100 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' commit 54df419508e016f7ff2bc9bac380712fc12e7ed8 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 12 11:04:55 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 1e828f883aa1c6d40659bc3a2f7fdaa1d5fcbe31 Merge: 857c8ac 9094028 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 12 11:04:45 2016 +0100 [jgitflow-maven-plugin]merging 'release/5.1.2' into 'master-5.x' commit 9094028b21810e6a1d1267db140182f76b144916 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 12 10:52:02 2016 +0100 Add missing license header commit 57eaedec8d85cbfc90efd8211a677daf023aad96 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 12 09:51:22 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/5.1.2' with non-snapshot versions Summary of changes: .../dto/gson/ObserveBlobsContainerAdapter.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 57eaedec8d85cbfc90efd8211a677daf023aad96 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 12 09:51:22 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/5.1.2' 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 7eb21cd..55262ec 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index bb218c1..ac607be 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index a6a0a8a..afc2d8e 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index d11b449..f12a6f6 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 30a170f..13dc5dd 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index c68dbda..e6e2b94 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 20e8d40..c96035d 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 2c158c0..d30de32 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index cc9b2af..e286142 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 11a21b4..7ad87e7 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1.2-SNAPSHOT</version> + <version>5.1.2</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index bd64512..6591b8a 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index f154f53..052974d 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index a28a34a..78ee006 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index a5080f5..6b6f5b6 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 085df9a..2e6169f 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index ece9faf..c602305 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 5bdd6a9..f3c2133 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 372a93c..b3f30d9 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 685b0cc..24f7329 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 3c65ae1..6d0ec52 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 0952144..70d9b9c 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index e8d3987..b560d75 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 9513d08..fda5f09 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.2-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index a12dcac..bb3c626 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.2-SNAPSHOT</version> + <version>5.1.2</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 9094028b21810e6a1d1267db140182f76b144916 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 12 10:52:02 2016 +0100 Add missing license header --- .../dto/gson/ObserveBlobsContainerAdapter.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/gson/ObserveBlobsContainerAdapter.java b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/ObserveBlobsContainerAdapter.java index be5c055..7ef4d77 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/gson/ObserveBlobsContainerAdapter.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/gson/ObserveBlobsContainerAdapter.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.dto.gson; +/*- + * #%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% + */ + import com.google.common.collect.ImmutableMap; import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; -- 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 1e828f883aa1c6d40659bc3a2f7fdaa1d5fcbe31 Merge: 857c8ac 9094028 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 12 11:04:45 2016 +0100 [jgitflow-maven-plugin]merging 'release/5.1.2' into 'master-5.x' application-swing-configuration/pom.xml | 2 +- .../src/main/config/ObserveSwingApplication.ini | 8 +++ ...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 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- .../ui/actions/ImportStorageFromFileAction.java | 8 +++ .../swing/ui/actions/ShowConfigAction.java | 1 + .../application/swing/ui/admin/AdminUIModel.java | 6 +- .../swing/ui/admin/report/ReportModel.java | 3 +- .../list/impl/longline/TripLonglinesUIHandler.java | 13 ++-- .../list/impl/seine/TripSeinesUIHandler.java | 13 ++-- .../ui/content/open/ContentOpenableUIHandler.java | 15 +++++ .../swing/ui/storage/tabs/DataSelectionModel.java | 14 ++--- .../swing/ui/tree/ObserveTreeHelper.java | 5 +- .../loadors/ProgramLonglineNodeChildLoador.java | 4 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 4 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- .../v1/longline/TripLonglineServiceController.java | 6 +- .../v1/seine/TripSeineServiceController.java | 6 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- .../observe/ObserveTopiaApplicationContext.java | 12 ---- .../fr/ird/observe/ObserveTopiaConfiguration.java | 6 ++ .../entities/longline/TripLonglineTopiaDao.java | 4 +- .../observe/entities/seine/TripSeineTopiaDao.java | 4 +- pom.xml | 8 +-- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- ...ataReferenceSet.java => DataReferenceList.java} | 16 ++--- .../ird/observe/services/dto/DataReferenceSet.java | 6 +- .../services/dto}/ObserveBlobsContainer.java | 2 +- ...nceSet.java => ReferenceCollectionSupport.java} | 9 +-- .../dto/gson/ObserveBlobsContainerAdapter.java | 70 ++++++++++++++++++++++ .../services/dto/gson/ObserveDtoGsonSupplier.java | 5 ++ ...tAdapter.java => DataReferenceListAdapter.java} | 16 +++-- .../gson/reference/DataReferenceSetAdapter.java | 8 ++- ...java => ReferenceCollectionSupportAdapter.java} | 18 +++--- .../reference/ReferentialReferenceSetAdapter.java | 8 ++- .../dto/referential/ReferentialReferenceSet.java | 10 ++-- services-rest/pom.xml | 2 +- .../services/rest/http/ObserveResponseBuilder.java | 30 +++++----- .../seine/TripSeineGearUseServiceRestTest.java | 6 +- .../service/seine/TripSeineServiceRestTest.java | 6 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- .../services/topia/ObserveServiceTopia.java | 38 +++++++++--- .../service/ImportTripScriptTopiaSqlWork.java | 2 +- .../topia/service/ReferentialServiceTopia.java | 4 +- .../service/SqlScriptProducerServiceTopia.java | 2 +- .../topia/service/TripManagementServiceTopia.java | 2 +- .../service/longline/TripLonglineServiceTopia.java | 18 +++--- .../topia/service/seine/TripSeineServiceTopia.java | 12 ++-- .../service/TripManagementServiceTopiaTest.java | 5 +- .../service/seine/TripSeineServiceTopiaTest.java | 12 ++-- services/pom.xml | 2 +- .../service/AddSqlScriptProducerResult.java | 1 + .../service/longline/TripLonglineService.java | 6 +- .../services/service/seine/TripSeineService.java | 6 +- .../services/service/trip/ExportTripResult.java | 2 +- .../services/service/trip/ImportTripRequest.java | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 73 files changed, 329 insertions(+), 182 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 54df419508e016f7ff2bc9bac380712fc12e7ed8 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 12 11:04:55 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..55262ec 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.2</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index 7021bfb..ac607be 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.2</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 956fb53..afc2d8e 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.2</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index 977dbbf..f12a6f6 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.2</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index ffc472c..13dc5dd 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.2</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index abc9a09..e6e2b94 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.2</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 47626c9..c96035d 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.2</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 4ad5cb2..d30de32 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.2</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index 3ada1e5..e286142 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.2</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 381c97a..7ad87e7 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.2</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 13c1de5..6591b8a 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.2</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 9d7b734..052974d 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.2</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index c8dc956..78ee006 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.2</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 169e6ad..6b6f5b6 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.2</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 976b1ec..2e6169f 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.2</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 0540ee6..c602305 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.2</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 757edd8..f3c2133 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.2</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 1935dd8..b3f30d9 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.2</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 650374d..24f7329 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.2</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 24cbbd6..6d0ec52 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.2</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 9a43343..70d9b9c 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.2</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index dad415e..b560d75 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.2</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 4fc1263..fda5f09 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.2</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index 84c0493..bb3c626 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.2</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 0d25efb1a8018fe220a3016ceddab01ca682ebeb Merge: 54df419 1e828f8 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 12 11:04:57 2016 +0100 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' .../dto/gson/ObserveBlobsContainerAdapter.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 49ffee388f12eb5879a3abf0b0183fb2ce213fd1 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 12 11:04:58 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 55262ec..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.2</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 ac607be..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.2</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 afc2d8e..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.2</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 f12a6f6..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.2</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 13dc5dd..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.2</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 e6e2b94..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.2</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 c96035d..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.2</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index d30de32..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.2</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index e286142..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.2</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 7ad87e7..381c97a 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1.2</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 6591b8a..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.2</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 052974d..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.2</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 78ee006..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.2</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 6b6f5b6..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.2</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 2e6169f..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.2</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index c602305..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.2</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 f3c2133..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.2</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 b3f30d9..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.2</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 24f7329..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.2</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 6d0ec52..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.2</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 70d9b9c..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.2</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 b560d75..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.2</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 fda5f09..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.2</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 bb3c626..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.2</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