branch develop-5.x updated (a072348 -> bbb31d4)
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 a072348 [jgitflow-maven-plugin]updating poms for 5.2.2-SNAPSHOT development new d3326f4 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds c0eb833 [jgitflow-maven-plugin]updating poms for 5.2.1 branch with snapshot versions new b005794 [jgitflow-maven-plugin]updating poms for branch'release/5.2.1' with non-snapshot versions new d798c3f Add missing license header new add1438 [jgitflow-maven-plugin]merging 'release/5.2.1' into 'master-5.x' new 20113b8 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' new bbb31d4 [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 bbb31d4dc8c866130c704c268dec8948c09ed256 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 13 09:03:39 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 20113b897d2d8557bd44912a92c18dff579de40a Merge: d3326f4 add1438 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 13 09:03:38 2017 +0100 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' commit d3326f4793afd4c848b4abdba30a866fd328a41e Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 13 09:03:37 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit add143886acbc9ac85a384333de0bfd23905c175 Merge: 328a3be d798c3f Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 13 09:03:31 2017 +0100 [jgitflow-maven-plugin]merging 'release/5.2.1' into 'master-5.x' commit d798c3f46183e48fc56c4b0e5aa6294c93309c95 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 13 09:03:09 2017 +0100 Add missing license header commit b005794d59d99052adb2c465392311d684a7cfbb Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 13 08:56:35 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/5.2.1' with non-snapshot versions Summary of changes: .../entities/referentiel/SpeciesTopiaDao.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 b005794d59d99052adb2c465392311d684a7cfbb Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 13 08:56:35 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/5.2.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 52cc49b..82dd754 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index 40fd68f..27f0158 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 9818bcd..0306c0d 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index 69019aa..471fd39 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 2622f86..4076665 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 591783d..4471a69 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index f0fcf35..190477a 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 9510eb4..7f9ab7a 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index c52fb47..4ac683a 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 5fe450c..abf9cf2 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.2.1-SNAPSHOT</version> + <version>5.2.1</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 37090b7..9a2daa4 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 877c6f1..8b416f8 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index 0387d90..8740e66 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 6876129..be9d420 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index f996720..60f8082 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 1ee286f..e552ff7 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index abbf78c..a646201 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 73865c3..74a95bf 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 54c4fce..afbe042 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 508b65a..5c272a0 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 7e5e814..35bd069 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 3d06952..3cc6eef 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index c4ecd46..81e432b 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.1-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index f2a493e..1c2dd32 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.1-SNAPSHOT</version> + <version>5.2.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 d798c3f46183e48fc56c4b0e5aa6294c93309c95 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 13 09:03:09 2017 +0100 Add missing license header --- .../entities/referentiel/SpeciesTopiaDao.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesTopiaDao.java index b2a111f..fe35319 100644 --- a/entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesTopiaDao.java +++ b/entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesTopiaDao.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.referentiel; +/*- + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.longline.CatchLongline; import fr.ird.observe.entities.longline.CatchLonglineTopiaDao; -- 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 add143886acbc9ac85a384333de0bfd23905c175 Merge: 328a3be d798c3f Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 13 09:03:31 2017 +0100 [jgitflow-maven-plugin]merging 'release/5.2.1' into 'master-5.x' application-swing-configuration/pom.xml | 2 +- ...pplication-swing-configuration_en_GB.properties | 6 +- ...pplication-swing-configuration_es_ES.properties | 24 +- ...pplication-swing-configuration_fr_FR.properties | 10 +- application-swing-decoration/pom.xml | 2 +- .../swing/decoration/DecoratorService.java | 1250 +++++++++++++------- .../application-swing-decoration_en_GB.properties | 30 - .../application-swing-decoration_es_ES.properties | 42 +- .../application-swing-decoration_fr_FR.properties | 30 - application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 10 +- .../i18n/application-swing_en_GB.properties | 29 +- .../i18n/application-swing_es_ES.properties | 61 +- .../i18n/application-swing_fr_FR.properties | 29 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- .../entities/referentiel/SpeciesTopiaDao.java | 270 +++++ 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/dto/referential/ProgramHelper.java | 11 +- 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 +- 37 files changed, 1191 insertions(+), 659 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 d3326f4793afd4c848b4abdba30a866fd328a41e Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 13 09:03:37 2017 +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 29b0301..82dd754 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index a6ef08f..27f0158 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 9678cb3..0306c0d 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index e0deb35..471fd39 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index d10bb7a..4076665 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 6e0e16b..4471a69 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index f60b4db..190477a 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index b462d7e..7f9ab7a 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index f1ef5b0..4ac683a 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index a08a9a7..abf9cf2 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.2.2-SNAPSHOT</version> + <version>5.2.1</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 380f911..9a2daa4 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 0728917..8b416f8 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index 2014b2c..8740e66 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index c8a29c6..be9d420 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 6765d79..60f8082 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 36a4abd..e552ff7 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 06d2717..a646201 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 9163934..74a95bf 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 58462a7..afbe042 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index f1cfbfc..5c272a0 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 5955574..35bd069 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index b1155db..3cc6eef 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 2aa0a2a..81e432b 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.2-SNAPSHOT</version> + <version>5.2.1</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index 0ffe5f9..1c2dd32 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.2-SNAPSHOT</version> + <version>5.2.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 20113b897d2d8557bd44912a92c18dff579de40a Merge: d3326f4 add1438 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 13 09:03:38 2017 +0100 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' .../entities/referentiel/SpeciesTopiaDao.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 bbb31d4dc8c866130c704c268dec8948c09ed256 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 13 09:03:39 2017 +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 82dd754..29b0301 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index 27f0158..a6ef08f 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 0306c0d..9678cb3 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index 471fd39..e0deb35 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 4076665..d10bb7a 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 4471a69..6e0e16b 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 190477a..f60b4db 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 7f9ab7a..b462d7e 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index 4ac683a..f1ef5b0 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index abf9cf2..a08a9a7 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.2.1</version> + <version>5.2.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 9a2daa4..380f911 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 8b416f8..0728917 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index 8740e66..2014b2c 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index be9d420..c8a29c6 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 60f8082..6765d79 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index e552ff7..36a4abd 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index a646201..06d2717 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 74a95bf..9163934 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index afbe042..58462a7 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 5c272a0..f1cfbfc 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 35bd069..5955574 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 3cc6eef..b1155db 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 81e432b..2aa0a2a 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.1</version> + <version>5.2.2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index 1c2dd32..0ffe5f9 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.1</version> + <version>5.2.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