branch develop updated (00befa7 -> 0caab03)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 00befa7 [jgitflow-maven-plugin]updating poms for 5.1-SNAPSHOT development new 1503e4e [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a4443f1 [jgitflow-maven-plugin]updating poms for 5.0.2 branch with snapshot versions new e513d71 Add missing license header new b41b096 [jgitflow-maven-plugin]updating poms for branch'release/5.0.2' with non-snapshot versions new 011e671 [jgitflow-maven-plugin]merging 'release/5.0.2' into 'master' new 71b2494 [jgitflow-maven-plugin]merging 'master' into 'develop' new 0caab03 [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 0caab03a6385aabc54197ae01d0a1ffd2a412022 Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 4 11:14:18 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 71b249400abf70b68717eff090c4dbf5573b9013 Merge: 1503e4e 011e671 Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 4 11:14:16 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 1503e4e9bc6afbad093a7567b4b2eec8ff91a46a Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 4 11:14:15 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 011e67144a7d3eafb9a69a200f5a1747fd6698fc Merge: c970a73 b41b096 Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 4 11:14:07 2016 +0200 [jgitflow-maven-plugin]merging 'release/5.0.2' into 'master' commit b41b096611106e20bcf4186306065b6436873f47 Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 4 11:03:40 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/5.0.2' with non-snapshot versions commit e513d715fe62079b5e989fa0e5879ac9d602b8bf Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 4 11:02:38 2016 +0200 Add missing license header Summary of changes: .../data/DataSynchroSelectionTreeCellRenderer.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 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit e513d715fe62079b5e989fa0e5879ac9d602b8bf Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 4 11:02:38 2016 +0200 Add missing license header --- .../data/DataSynchroSelectionTreeCellRenderer.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java index 6b6cd04..1a9bb4d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroSelectionTreeCellRenderer.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data; +/*- + * #%L + * ObServe :: Application Swing + * %% + * 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.ImmutableSet; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.tree.DataSelectionTreeCellRenderer; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit b41b096611106e20bcf4186306065b6436873f47 Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 4 11:03:40 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/5.0.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 81e64dc..2c317f5 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index 3ec8851..3a7ce39 100644 --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 013fa12..fb6378e 100644 --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index ce89bb1..4af4a13 100644 --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 7e88c46..1be2a00 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index ac0207b..b714e73 100644 --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 7855bdb..d00469b 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 67dcb8f..5cdbd83 100644 --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index ba1d572..202d94e 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 349b007..bda4b4f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 64a9c97..9f185d2 100644 --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 16bdf58..7178a90 100644 --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index 38f12de..4e59e96 100644 --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index e7a6a6b..1717a87 100644 --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 15a3858..bc07331 100644 --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 6545bc3..df29749 100644 --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 1db4be1..61dfa0f 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 7f85f4a..0cdbfc5 100644 --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 243cb7a..b07a119 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 9eded33..b1dd530 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 802cf21..1c732bd 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 577b6fd..7db73b1 100644 --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 817f8c5..1ef0f3d 100644 --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index 9863aef..c21f957 100644 --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2-SNAPSHOT</version> + <version>5.0.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 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 011e67144a7d3eafb9a69a200f5a1747fd6698fc Merge: c970a73 b41b096 Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 4 11:14:07 2016 +0200 [jgitflow-maven-plugin]merging 'release/5.0.2' into 'master' application-swing-configuration/pom.xml | 15 +- .../src/main/config/ObserveSwingApplication.toml | 601 +++++++++++++++++++++ .../ObserveSwingApplicationConfig.java | 51 +- .../ObserveSwingApplicationConfigProvider.java | 59 -- .../org.nuiton.config.ApplicationConfigProvider | 1 - ...pplication-swing-configuration_en_GB.properties | 2 +- ...pplication-swing-configuration_es_ES.properties | 2 +- ...pplication-swing-configuration_fr_FR.properties | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 55 +- application-swing/src/main/assembly/bin.xml | 2 +- .../data/DataSynchroSelectionTreeCellRenderer.java | 84 +++ .../ui/admin/synchronize/data/DataSynchroUI.jcss | 4 +- .../referential/ng/ReferentialSynchroUI.jcss | 6 - .../ng/ReferentialSynchronizeResources.java | 11 + .../ng/action/RegisterDesactivateTaskAction.java | 6 +- .../ReferentialSynchronizeTreeCellRenderer.java | 6 +- .../GearUseFeatureMeasurementCellEditor.java | 13 +- .../GearUseFeatureMeasurementCellRenderer.java | 24 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 4 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 + .../swing/ui/storage/StorageUIHandler.java | 2 +- .../swing/ui/storage/tabs/ConfigUI.jcss | 2 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../i18n/application-swing_en_GB.properties | 8 +- .../i18n/application-swing_es_ES.properties | 8 +- .../i18n/application-swing_fr_FR.properties | 8 +- application-web-configuration/pom.xml | 16 +- .../src/main/config/ObserveWebApplication.toml | 112 ++++ .../configuration/ObserveWebApplicationConfig.java | 237 ++++++++ ... ObserveWebApplicationConfigInitException.java} | 6 +- .../ObserveWebApplicationConfiguration.java | 266 --------- .../ObserveWebApplicationConfigurationOption.java | 131 ----- ...ObserveWebApplicationConfigurationProvider.java | 61 --- .../org.nuiton.config.ApplicationConfigProvider | 1 - .../src/main/resources/defaultDatabases.yml | 16 + .../src/main/resources/defaultUsers.yml | 13 + .../application-web-configuration_en_GB.properties | 2 +- .../application-web-configuration_es_ES.properties | 2 +- .../application-web-configuration_fr_FR.properties | 2 +- application-web/pom.xml | 20 +- .../web/ObserveWebApplicationContext.java | 8 +- .../web/ObserveWebApplicationListener.java | 9 +- .../web/controller/ObserveWebMotionController.java | 4 +- .../web/controller/v1/PingServiceController.java | 4 +- .../ObserveWebSecurityApplicationContext.java | 4 +- .../db/ObserveWebDatabasesHelperTest.java | 8 +- .../user/ObserveWebUsersHelperTest.java | 6 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 26 +- 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 +- .../diff/ReferentialSynchronizeDiffState.java | 8 +- src/site/rst/administration-web.rst.vm | 99 +++- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 69 files changed, 1393 insertions(+), 686 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 1503e4e9bc6afbad093a7567b4b2eec8ff91a46a Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 4 11:14:15 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 2 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- services/pom.xml | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/application-swing-configuration/pom.xml b/application-swing-configuration/pom.xml index f0a730a..2c317f5 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index bdcba78..3a7ce39 100644 --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 6562ce6..fb6378e 100644 --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index db46ade..4af4a13 100644 --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index f1d2197..1be2a00 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 9f59de7..b714e73 100644 --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 8e31dc1..d00469b 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index a11a8ed..5cdbd83 100644 --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index 6623109..202d94e 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 1377c73..bda4b4f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index aeae421..9f185d2 100644 --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 02f45bc..7178a90 100644 --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index 61ecb83..4e59e96 100644 --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 6d81c5e..1717a87 100644 --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 6d6e459..bc07331 100644 --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 9bad970..df29749 100644 --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index ee6361b..61dfa0f 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index ee8ee0d..0cdbfc5 100644 --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 33b8ca7..b07a119 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 05c202b..b1dd530 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index ab4b4f9..1c732bd 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 98758de..7db73b1 100644 --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index d053b63..1ef0f3d 100644 --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.2</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index c18938a..c21f957 100644 --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0.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 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 71b249400abf70b68717eff090c4dbf5573b9013 Merge: 1503e4e 011e671 Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 4 11:14:16 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../data/DataSynchroSelectionTreeCellRenderer.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 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 0caab03a6385aabc54197ae01d0a1ffd2a412022 Author: Maven Release <maven-release@codelutin.com> Date: Tue Oct 4 11:14:18 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 2 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- services/pom.xml | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/application-swing-configuration/pom.xml b/application-swing-configuration/pom.xml index 2c317f5..f0a730a 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index 3a7ce39..bdcba78 100644 --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index fb6378e..6562ce6 100644 --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index 4af4a13..db46ade 100644 --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 1be2a00..f1d2197 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index b714e73..9f59de7 100644 --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index d00469b..8e31dc1 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 5cdbd83..a11a8ed 100644 --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index 202d94e..6623109 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index bda4b4f..1377c73 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 9f185d2..aeae421 100644 --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 7178a90..02f45bc 100644 --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index 4e59e96..61ecb83 100644 --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 1717a87..6d81c5e 100644 --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index bc07331..6d6e459 100644 --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index df29749..9bad970 100644 --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 61dfa0f..ee6361b 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 0cdbfc5..ee8ee0d 100644 --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index b07a119..33b8ca7 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index b1dd530..05c202b 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 1c732bd..ab4b4f9 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 7db73b1..98758de 100644 --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 1ef0f3d..d053b63 100644 --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index c21f957..c18938a 100644 --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0.2</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm