branch develop-5.x updated (b30fd20 -> b40b4a1)
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 b30fd20 Problèmes lors de la synchro du référentiel de bases locales (Fixes #8853) new b1ead72 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds c89e1ad [jgitflow-maven-plugin]updating poms for 5.1.1 branch with snapshot versions new 28b91d1 [jgitflow-maven-plugin]updating poms for branch'release/5.1.1' with non-snapshot versions new b7672da Problèmes lors de la synchro du référentiel de bases locales (Fixes #8853) new 857c8ac [jgitflow-maven-plugin]merging 'release/5.1.1' into 'master-5.x' new 141f868 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' new b40b4a1 [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 b40b4a12e67c2f772591771722e3a810fdbeecd8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 8 14:59:40 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 141f868e094ea198f6437f0f05391788f09ac7bb Merge: b1ead72 857c8ac Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 8 14:59:38 2016 +0100 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' commit b1ead72c9e42f022fa13e85374766951f44c7552 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 8 14:59:36 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 857c8ac0fd884151f809ff7b8f6007e4ea408f07 Merge: 2bd88a9 b7672da Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 8 14:59:24 2016 +0100 [jgitflow-maven-plugin]merging 'release/5.1.1' into 'master-5.x' commit b7672dad8112eba5aead7db5ffc676c92c872332 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 8 14:47:20 2016 +0100 Problèmes lors de la synchro du référentiel de bases locales (Fixes #8853) commit 28b91d162283784759ff8f023416bc00f189b96e Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 8 14:13:33 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/5.1.1' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 28b91d162283784759ff8f023416bc00f189b96e Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 8 14:13:33 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/5.1.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 6909014..f3c5f14 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index ab970e7..b15e26d 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 201677e..4906f68 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index 372616d..f69cb80 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 98f4421..aafec71 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 470e17b..8a97dca 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 1bb4f0d..be0ae38 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index ef50e59..97dbce8 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index 1e78b86..277b4ab 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index e758aa8..f1d9d13 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1.1-SNAPSHOT</version> + <version>5.1.1</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 80f2769..864f3c6 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 3d168d7..37e031c 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index a8fa9ef..531fd12 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 83cebdd..8da2888 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 293b324..2393a1a 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index e6c005e..63f6888 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index b3ad0c3..9273994 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 1a07924..468f489 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 88af5bb..10cc73b 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index b4b1f13..4596c00 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 0c57128..f2e930b 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index b3ea673..e64db11 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 64f994d..1ad7194 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.1-SNAPSHOT</version> + <version>5.1.1</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index d2c4284..260b553 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.1-SNAPSHOT</version> + <version>5.1.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 b7672dad8112eba5aead7db5ffc676c92c872332 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 8 14:47:20 2016 +0100 Problèmes lors de la synchro du référentiel de bases locales (Fixes #8853) --- .../java/fr/ird/observe/services/dto/referential/ReferentialHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java index 9167511..e3541a1 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java @@ -74,12 +74,12 @@ public class ReferentialHelper extends GeneratedReferentialHelper { VesselTypeDto.class, VesselDto.class, SpeciesGroupDto.class, + OceanDto.class, SpeciesDto.class, SexDto.class, FpaZoneDto.class, SpeciesListDto.class, PersonDto.class, - OceanDto.class, OrganismDto.class, LengthWeightParameterDto.class, ProgramDto.class, -- 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 857c8ac0fd884151f809ff7b8f6007e4ea408f07 Merge: 2bd88a9 b7672da Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 8 14:59:24 2016 +0100 [jgitflow-maven-plugin]merging 'release/5.1.1' into 'master-5.x' application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- .../decorators/DataReferenceDecorator.java | 5 + application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- .../swing/ui/actions/StartH2WebServerAction.java | 3 +- .../swing/ui/storage/tabs/ConfigUI.jaxx | 410 ++++++++++----------- 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 +- .../dto/referential/ReferentialHelper.java | 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 +- .../ReferentialSynchronizeSqlsRequestBuilder.java | 9 +- services/pom.xml | 2 +- ...UnidirectionalReferentialSynchronizeEngine.java | 21 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 30 files changed, 250 insertions(+), 248 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 b1ead72c9e42f022fa13e85374766951f44c7552 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 8 14:59:36 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..f3c5f14 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.1</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index 7021bfb..b15e26d 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.1</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 956fb53..4906f68 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.1</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index 977dbbf..f69cb80 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.1</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index ffc472c..aafec71 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.1</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index abc9a09..8a97dca 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.1</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 47626c9..be0ae38 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.1</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 4ad5cb2..97dbce8 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.1</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index 3ada1e5..277b4ab 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.1</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 6f30653..f1d9d13 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.1</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 13c1de5..864f3c6 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.1</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 9d7b734..37e031c 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.1</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index c8dc956..531fd12 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.1</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 169e6ad..8da2888 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.1</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 976b1ec..2393a1a 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.1</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 0540ee6..63f6888 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.1</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 757edd8..9273994 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.1</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 1935dd8..468f489 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.1</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 650374d..10cc73b 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.1</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 24cbbd6..4596c00 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.1</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 9a43343..f2e930b 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.1</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index dad415e..e64db11 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.1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 4fc1263..1ad7194 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.1</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index 84c0493..260b553 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.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 141f868e094ea198f6437f0f05391788f09ac7bb Merge: b1ead72 857c8ac Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 8 14:59:38 2016 +0100 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' -- 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 b40b4a12e67c2f772591771722e3a810fdbeecd8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 8 14:59:40 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 f3c5f14..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.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 b15e26d..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.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 4906f68..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.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 f69cb80..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.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 aafec71..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.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 8a97dca..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.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 be0ae38..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.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 97dbce8..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.1</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index 277b4ab..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.1</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index f1d9d13..6f30653 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1.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 864f3c6..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.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 37e031c..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.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 531fd12..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.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 8da2888..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.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 2393a1a..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.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 63f6888..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.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 9273994..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.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 468f489..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.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 10cc73b..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.1</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 4596c00..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.1</version> + <version>5.2-SNAPSHOT</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index f2e930b..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.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 e64db11..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.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 1ad7194..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.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 260b553..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.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