branch develop-2.x updated (7c6bc70 -> d65f5af)
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 7c6bc70 [jgitflow-maven-plugin]updating poms for 2.30-SNAPSHOT development new 85fa671 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 0f6dfb1 Up to nuiton-utils 3.0-rc-12 (downgrade to jdk 1.6 please) adds a5bd80f Fixes #3946: Update nuiton-version to 1.0-rc-2 Fixes #3947: Update nuiton-config to 3.0-rc-5 Fixes #3948: Update nuiton-utils to 3.0-rc-12 adds 8228758 the plugin must stay in java 8 since we are building it with java 8... adds 0c66a10 update third parties adds be42fd5 Adding missing license header adds 613540e [jgitflow-maven-plugin]updating poms for branch'release/2.29' with non-snapshot versions new f48dd0a [jgitflow-maven-plugin]merging 'release/2.29' into 'master-2.x' new 6e8310f [jgitflow-maven-plugin]merging 'master-2.x' into 'develop-2.x' new d65f5af [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 4 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 d65f5afaec09f28d706052bf233e837a6c08ee88 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 27 19:56:58 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 6e8310f100ae099c20cfda826e8c9a4b89337058 Merge: 85fa671 f48dd0a Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 27 19:56:57 2016 +0200 [jgitflow-maven-plugin]merging 'master-2.x' into 'develop-2.x' commit 85fa6712e86795f22e85a0d0263c7e8935234a2a Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 27 19:56:57 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit f48dd0a13c117a3a040b5d424ab3440df24876dd Merge: 99632ca 613540e Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 27 19:56:55 2016 +0200 [jgitflow-maven-plugin]merging 'release/2.29' into 'master-2.x' Summary of changes: jaxx-maven-plugin/pom.xml | 6 ++++++ .../src/license/THIRD-PARTY.properties | 12 +++--------- .../runtime/swing/renderer/EnumEditorRenderer.java | 22 ++++++++++++++++++++++ pom.xml | 6 +++--- 4 files changed, 34 insertions(+), 12 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 f48dd0a13c117a3a040b5d424ab3440df24876dd Merge: 99632ca 613540e Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 27 19:56:55 2016 +0200 [jgitflow-maven-plugin]merging 'release/2.29' into 'master-2.x' jaxx-widgets/README.txt => README.md | 0 .../README.txt => jaxx-application-api/README.md | 0 jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/{README.txt => README.md} | 0 jaxx-application-swing/pom.xml | 2 +- .../README.txt => jaxx-compiler/README.md | 0 jaxx-compiler/pom.xml | 2 +- .../README.txt => jaxx-config/README.md | 0 jaxx-config/pom.xml | 2 +- jaxx-widgets-gis/README.txt => jaxx-demo/README.md | 0 jaxx-demo/pom.xml | 2 +- .../README.txt => jaxx-maven-plugin/README.md | 0 jaxx-maven-plugin/pom.xml | 42 ++++++- .../src/license/THIRD-PARTY.properties | 12 +- .../java/org/nuiton/jaxx/plugin/JaxxBaseTest.java | 69 +++++++---- .../README.txt => jaxx-runtime/README.md | 0 jaxx-runtime/pom.xml | 2 +- .../java/jaxx/runtime/swing/editor/EnumEditor.java | 6 + .../runtime/swing/renderer/EnumEditorRenderer.java | 53 ++++++++ .../swing/session/JXTableSwingSessionState.java | 7 +- .../README.txt => jaxx-validator/README.md | 0 jaxx-validator/pom.xml | 2 +- jaxx-widgets-common/{README.txt => README.md} | 0 jaxx-widgets-common/pom.xml | 2 +- .../README.txt => jaxx-widgets-datetime/README.md | 0 jaxx-widgets-datetime/pom.xml | 2 +- .../README.txt => jaxx-widgets-extra/README.md | 0 jaxx-widgets-extra/pom.xml | 2 +- jaxx-demo/README.txt => jaxx-widgets-gis/README.md | 0 jaxx-widgets-gis/pom.xml | 2 +- .../README.txt => jaxx-widgets-number/README.md | 0 jaxx-widgets-number/pom.xml | 2 +- .../README.txt => jaxx-widgets-select/README.md | 0 jaxx-widgets-select/pom.xml | 2 +- README.txt => jaxx-widgets/README.md | 0 jaxx-widgets/pom.xml | 2 +- .../swing/editor/bean/BeanDoubleListHandler.java | 76 +++++++----- .../swing/editor/bean/BeanDoubleListModel.java | 23 ++++ pom.xml | 135 +++++++-------------- 39 files changed, 278 insertions(+), 173 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 85fa6712e86795f22e85a0d0263c7e8935234a2a Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 27 19:56:57 2016 +0200 [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-demo/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/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 f072430..e332296 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.30-SNAPSHOT</version> + <version>2.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index b21b01a..e0eefd6 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.30-SNAPSHOT</version> + <version>2.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 271b408..80080f9 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.30-SNAPSHOT</version> + <version>2.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index fd65409..9cef6eb 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.30-SNAPSHOT</version> + <version>2.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index e9444d2..bbf23c0 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.30-SNAPSHOT</version> + <version>2.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index dbcd69d..d178fb7 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.30-SNAPSHOT</version> + <version>2.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index c66bbe2..4b97e83 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.30-SNAPSHOT</version> + <version>2.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index 715eac9..a113a4a 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.30-SNAPSHOT</version> + <version>2.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-common/pom.xml b/jaxx-widgets-common/pom.xml index 48dfd61..507cc9f 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.30-SNAPSHOT</version> + <version>2.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index f90b81d..14cc85d 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.30-SNAPSHOT</version> + <version>2.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index d09de5d..a5c5e46 100644 --- a/jaxx-widgets-extra/pom.xml +++ b/jaxx-widgets-extra/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index 66088e7..9deab30 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.30-SNAPSHOT</version> + <version>2.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-number/pom.xml b/jaxx-widgets-number/pom.xml index ebb0a31..23f837a 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.30-SNAPSHOT</version> + <version>2.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-select/pom.xml b/jaxx-widgets-select/pom.xml index fed70de..fb9871d 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.30-SNAPSHOT</version> + <version>2.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 42d091e..03aebdc 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.30-SNAPSHOT</version> + <version>2.29</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index c259d99..b650e96 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.30-SNAPSHOT</version> + <version>2.29</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 6e8310f100ae099c20cfda826e8c9a4b89337058 Merge: 85fa671 f48dd0a Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 27 19:56:57 2016 +0200 [jgitflow-maven-plugin]merging 'master-2.x' into 'develop-2.x' jaxx-maven-plugin/pom.xml | 6 ++++++ .../src/license/THIRD-PARTY.properties | 12 +++--------- .../runtime/swing/renderer/EnumEditorRenderer.java | 22 ++++++++++++++++++++++ pom.xml | 6 +++--- 4 files changed, 34 insertions(+), 12 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 d65f5afaec09f28d706052bf233e837a6c08ee88 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 27 19:56:58 2016 +0200 [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-demo/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/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 e332296..f072430 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.29</version> + <version>2.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index e0eefd6..b21b01a 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.29</version> + <version>2.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 80080f9..271b408 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.29</version> + <version>2.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index 9cef6eb..fd65409 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.29</version> + <version>2.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index bbf23c0..e9444d2 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.29</version> + <version>2.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index fcdab23..52cccc3 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.29</version> + <version>2.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index 4b97e83..c66bbe2 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.29</version> + <version>2.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index a113a4a..715eac9 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.29</version> + <version>2.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-common/pom.xml b/jaxx-widgets-common/pom.xml index 507cc9f..48dfd61 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.29</version> + <version>2.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index 14cc85d..f90b81d 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.29</version> + <version>2.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index a5c5e46..d09de5d 100644 --- a/jaxx-widgets-extra/pom.xml +++ b/jaxx-widgets-extra/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.29</version> + <version>2.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index 9deab30..66088e7 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.29</version> + <version>2.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-number/pom.xml b/jaxx-widgets-number/pom.xml index 23f837a..ebb0a31 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.29</version> + <version>2.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-select/pom.xml b/jaxx-widgets-select/pom.xml index fb9871d..fed70de 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.29</version> + <version>2.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 03aebdc..42d091e 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.29</version> + <version>2.30-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index 524f597..378e35c 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.29</version> + <version>2.30-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