[Observe-commits] 03/05: [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts

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 3c84b795ecb44a4e66be4d8e6846748442bacdd3 Author: Maven Release <maven-release@codelutin.com> Date: Sun Jan 1 19:20:39 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 +- common/pom.xml | 2 +- persistence/pom.xml | 2 +- pom.xml | 2 +- services-binder/pom.xml | 2 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia/pom.xml | 2 +- services-validation/pom.xml | 2 +- services-validators/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 1d51200..86e15d0 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>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index 078fd1e..f0b83c9 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>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 4ca1d86..0056d42 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>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index 4a26988..ae7270b 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>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 2c852c0..ab4487f 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>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 7044dc3..8e91d6a 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>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 748ba43..d202c00 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>application-web</artifactId> diff --git a/common/pom.xml b/common/pom.xml index 07282c5..2b0394c 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>common</artifactId> diff --git a/persistence/pom.xml b/persistence/pom.xml index 53082bf..3b03eb1 100644 --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>persistence</artifactId> diff --git a/pom.xml b/pom.xml index eab2fea..f957674 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-binder/pom.xml b/services-binder/pom.xml index 0c49a98..48aec7a 100644 --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>services-binder</artifactId> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index a1d5c41..1895ab2 100644 --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index b1d76e9..954957c 100644 --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index 35df63f..92d26c2 100644 --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index a516210..307cfdc 100644 --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 06b0cad..5b05965 100644 --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index fa2623a..7b0114b 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services-validation/pom.xml b/services-validation/pom.xml index fb69ba5..9aa5ba4 100644 --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>services-validation</artifactId> diff --git a/services-validators/pom.xml b/services-validators/pom.xml index c49577c..f343e5d 100644 --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>services-validators</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 6b80166..9f876b3 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 7a739af..acdd2a5 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 95474ff..d3b8ecf 100644 --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 39cd16b..06811ab 100644 --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index ee9d746..cdbbf54 100644 --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> + <version>6.0-RC-3</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>.