branch develop-2.x updated (4564b7f -> 83af600)
This is an automated email from the git hooks/post-receive script. New change to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git from 4564b7f [jgitflow-maven-plugin]updating poms for 2.42-SNAPSHOT development new 845ae31 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new f4f052a [jgitflow-maven-plugin]updating poms for branch'release/2.41' with non-snapshot versions new b0a048a do not send email (I dont have this configuration) new b99ba3e fix jaxx-demo version new 6959b34 [jgitflow-maven-plugin]merging 'release/2.41' into 'master-2.x' new b56afb7 [jgitflow-maven-plugin]merging 'master-2.x' into 'develop-2.x' new 83af600 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 7 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 83af6002f5f3c3af0acb4cd3c37171ad17d676e2 Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Mar 3 13:05:52 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit b56afb7ad93b409732a45c7f0944744c0483ab1d Merge: 845ae31 6959b34 Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Mar 3 13:05:52 2017 +0100 [jgitflow-maven-plugin]merging 'master-2.x' into 'develop-2.x' commit 845ae3168770a07ce93c1a178e6d1d3bba807cd8 Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Mar 3 13:05:52 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 6959b34b82ff4898e8bf2a2353dff7eb2adc273c Merge: b69818b b99ba3e Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Mar 3 13:05:50 2017 +0100 [jgitflow-maven-plugin]merging 'release/2.41' into 'master-2.x' commit b99ba3e43c2321d1f81f7f9116e44873306c091b Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Mar 3 13:05:30 2017 +0100 fix jaxx-demo version commit b0a048aff21d00ee08ecf4311628a44540348f13 Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Mar 3 12:46:39 2017 +0100 do not send email (I dont have this configuration) commit f4f052a90d342645ff285aeb1a5df78b7152f17b Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Mar 3 12:40:39 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.41' with non-snapshot versions Summary of changes: jaxx-demo/pom.xml | 2 +- pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit f4f052a90d342645ff285aeb1a5df78b7152f17b Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Mar 3 12:40:39 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.41' with non-snapshot versions --- jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-about/pom.xml | 2 +- jaxx-widgets-common/pom.xml | 2 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets-number/pom.xml | 2 +- jaxx-widgets-select/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/jaxx-application-api/pom.xml b/jaxx-application-api/pom.xml index 1f16ffe..9c1097f 100644 --- a/jaxx-application-api/pom.xml +++ b/jaxx-application-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index 8dfbc40..a2fe1c9 100644 --- a/jaxx-application-swing/pom.xml +++ b/jaxx-application-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 3aa883c..f58a4c6 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index bdbd970..31b49ad 100644 --- a/jaxx-config/pom.xml +++ b/jaxx-config/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index fc4a45a..c17c461 100644 --- a/jaxx-maven-plugin/pom.xml +++ b/jaxx-maven-plugin/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index 84938b1..5a6eca6 100644 --- a/jaxx-runtime/pom.xml +++ b/jaxx-runtime/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index 4f0d3c8..9648f93 100644 --- a/jaxx-validator/pom.xml +++ b/jaxx-validator/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-about/pom.xml b/jaxx-widgets-about/pom.xml index 0ca1903..29f26e9 100644 --- a/jaxx-widgets-about/pom.xml +++ b/jaxx-widgets-about/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-common/pom.xml b/jaxx-widgets-common/pom.xml index 9651962..979e58c 100644 --- a/jaxx-widgets-common/pom.xml +++ b/jaxx-widgets-common/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index 2177340..8930760 100644 --- a/jaxx-widgets-datetime/pom.xml +++ b/jaxx-widgets-datetime/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index bba392c..2ad8f05 100644 --- a/jaxx-widgets-extra/pom.xml +++ b/jaxx-widgets-extra/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index 97035d8..a614a9f 100644 --- a/jaxx-widgets-gis/pom.xml +++ b/jaxx-widgets-gis/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-number/pom.xml b/jaxx-widgets-number/pom.xml index e5f0316..03ae9ad 100644 --- a/jaxx-widgets-number/pom.xml +++ b/jaxx-widgets-number/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-select/pom.xml b/jaxx-widgets-select/pom.xml index 152fad8..a0bfedf 100644 --- a/jaxx-widgets-select/pom.xml +++ b/jaxx-widgets-select/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 2608dc1..30ff4da 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index d24705d..f976902 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> <modules> <module>jaxx-runtime</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit b0a048aff21d00ee08ecf4311628a44540348f13 Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Mar 3 12:46:39 2017 +0100 do not send email (I dont have this configuration) --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index f976902..0505444 100644 --- a/pom.xml +++ b/pom.xml @@ -162,6 +162,7 @@ <jgitflow.developBranchName>develop-2.x</jgitflow.developBranchName> <jgitflow.masterBranchName>master-2.x</jgitflow.masterBranchName> + <skipReleaseSendEmail>true</skipReleaseSendEmail> </properties> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit b99ba3e43c2321d1f81f7f9116e44873306c091b Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Mar 3 13:05:30 2017 +0100 fix jaxx-demo version --- jaxx-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 8ea11b9..2a61f1e 100644 --- a/jaxx-demo/pom.xml +++ b/jaxx-demo/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 6959b34b82ff4898e8bf2a2353dff7eb2adc273c Merge: b69818b b99ba3e Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Mar 3 13:05:50 2017 +0100 [jgitflow-maven-plugin]merging 'release/2.41' into 'master-2.x' jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 3 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-about/pom.xml | 2 +- jaxx-widgets-common/pom.xml | 2 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets-number/pom.xml | 2 +- jaxx-widgets-select/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- .../runtime/swing/editor/bean/BeanComboBox.jaxx | 2 + .../swing/editor/bean/BeanComboBoxHandler.java | 45 +++++++++++----------- pom.xml | 5 ++- 19 files changed, 45 insertions(+), 40 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 845ae3168770a07ce93c1a178e6d1d3bba807cd8 Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Mar 3 13:05:52 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-about/pom.xml | 2 +- jaxx-widgets-common/pom.xml | 2 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets-number/pom.xml | 2 +- jaxx-widgets-select/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/jaxx-application-api/pom.xml b/jaxx-application-api/pom.xml index aa5c5f0..9c1097f 100644 --- a/jaxx-application-api/pom.xml +++ b/jaxx-application-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index d34c76e..a2fe1c9 100644 --- a/jaxx-application-swing/pom.xml +++ b/jaxx-application-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 84811fe..f58a4c6 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index bc43829..31b49ad 100644 --- a/jaxx-config/pom.xml +++ b/jaxx-config/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index e95fd52..c17c461 100644 --- a/jaxx-maven-plugin/pom.xml +++ b/jaxx-maven-plugin/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index 99d389a..5a6eca6 100644 --- a/jaxx-runtime/pom.xml +++ b/jaxx-runtime/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index b70f9c3..9648f93 100644 --- a/jaxx-validator/pom.xml +++ b/jaxx-validator/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-about/pom.xml b/jaxx-widgets-about/pom.xml index b46d67c..29f26e9 100644 --- a/jaxx-widgets-about/pom.xml +++ b/jaxx-widgets-about/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-common/pom.xml b/jaxx-widgets-common/pom.xml index d9a1ad3..979e58c 100644 --- a/jaxx-widgets-common/pom.xml +++ b/jaxx-widgets-common/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index 54a0558..8930760 100644 --- a/jaxx-widgets-datetime/pom.xml +++ b/jaxx-widgets-datetime/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index 220d82c..2ad8f05 100644 --- a/jaxx-widgets-extra/pom.xml +++ b/jaxx-widgets-extra/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index a48f609..a614a9f 100644 --- a/jaxx-widgets-gis/pom.xml +++ b/jaxx-widgets-gis/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-number/pom.xml b/jaxx-widgets-number/pom.xml index 93a2e29..03ae9ad 100644 --- a/jaxx-widgets-number/pom.xml +++ b/jaxx-widgets-number/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-select/pom.xml b/jaxx-widgets-select/pom.xml index 26d7772..a0bfedf 100644 --- a/jaxx-widgets-select/pom.xml +++ b/jaxx-widgets-select/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 1b03eb0..30ff4da 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index 95b439d..f976902 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.42-SNAPSHOT</version> + <version>2.41</version> <modules> <module>jaxx-runtime</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit b56afb7ad93b409732a45c7f0944744c0483ab1d Merge: 845ae31 6959b34 Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Mar 3 13:05:52 2017 +0100 [jgitflow-maven-plugin]merging 'master-2.x' into 'develop-2.x' jaxx-demo/pom.xml | 2 +- pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 83af6002f5f3c3af0acb4cd3c37171ad17d676e2 Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Mar 3 13:05:52 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-about/pom.xml | 2 +- jaxx-widgets-common/pom.xml | 2 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets-number/pom.xml | 2 +- jaxx-widgets-select/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/jaxx-application-api/pom.xml b/jaxx-application-api/pom.xml index 9c1097f..aa5c5f0 100644 --- a/jaxx-application-api/pom.xml +++ b/jaxx-application-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index a2fe1c9..d34c76e 100644 --- a/jaxx-application-swing/pom.xml +++ b/jaxx-application-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index f58a4c6..84811fe 100644 --- a/jaxx-compiler/pom.xml +++ b/jaxx-compiler/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index 31b49ad..bc43829 100644 --- a/jaxx-config/pom.xml +++ b/jaxx-config/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index c17c461..e95fd52 100644 --- a/jaxx-maven-plugin/pom.xml +++ b/jaxx-maven-plugin/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index 5a6eca6..99d389a 100644 --- a/jaxx-runtime/pom.xml +++ b/jaxx-runtime/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index 9648f93..b70f9c3 100644 --- a/jaxx-validator/pom.xml +++ b/jaxx-validator/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-about/pom.xml b/jaxx-widgets-about/pom.xml index 29f26e9..b46d67c 100644 --- a/jaxx-widgets-about/pom.xml +++ b/jaxx-widgets-about/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-common/pom.xml b/jaxx-widgets-common/pom.xml index 979e58c..d9a1ad3 100644 --- a/jaxx-widgets-common/pom.xml +++ b/jaxx-widgets-common/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index 8930760..54a0558 100644 --- a/jaxx-widgets-datetime/pom.xml +++ b/jaxx-widgets-datetime/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index 2ad8f05..220d82c 100644 --- a/jaxx-widgets-extra/pom.xml +++ b/jaxx-widgets-extra/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index a614a9f..a48f609 100644 --- a/jaxx-widgets-gis/pom.xml +++ b/jaxx-widgets-gis/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-number/pom.xml b/jaxx-widgets-number/pom.xml index 03ae9ad..93a2e29 100644 --- a/jaxx-widgets-number/pom.xml +++ b/jaxx-widgets-number/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-select/pom.xml b/jaxx-widgets-select/pom.xml index a0bfedf..26d7772 100644 --- a/jaxx-widgets-select/pom.xml +++ b/jaxx-widgets-select/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 30ff4da..1b03eb0 100644 --- a/jaxx-widgets/pom.xml +++ b/jaxx-widgets/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index 0505444..73b10c0 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.41</version> + <version>2.42-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm