branch develop-2.x updated (e0b921d -> 6aacd90)
This is an automated email from the git hooks/post-receive script. New change to branch develop-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git from e0b921d [jgitflow-maven-plugin]updating poms for 2.25-SNAPSHOT development new ca75717 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new e501cf7 add license headers new 8523410 [jgitflow-maven-plugin]updating poms for branch'release/2.24' with non-snapshot versions new 9e7f68a Merge branch 'release/2.24' into master-2.x new dabedfb Merge branch 'master-2.x' into develop-2.x new 6aacd90 [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 6aacd90b844f17790ebba4407eaa80c950885b1b Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 12:32:07 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit dabedfb77cbebf05bd83cdcc4035e5bb20884457 Merge: ca75717 9e7f68a Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 12:32:06 2015 +0000 Merge branch 'master-2.x' into develop-2.x commit ca75717edf0efae486e24dd19cc92a5876cfa0f5 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 12:32:05 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 9e7f68abc7baa2be8763335e8f5ad9df9ba4844d Merge: f715774 8523410 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 12:31:59 2015 +0000 Merge branch 'release/2.24' into master-2.x commit 8523410a2659d66f8d196a87ca48d032f078e136 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 12:25:39 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.24' with non-snapshot versions commit e501cf7bb7586db0933e36b163a71d5438f54660 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 12:25:23 2015 +0000 add license headers Summary of changes: .../jaxx/compiler/java/parser/JavaParserTest.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 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 http://git.nuiton.org/jaxx.git commit e501cf7bb7586db0933e36b163a71d5438f54660 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 12:25:23 2015 +0000 add license headers --- .../jaxx/compiler/java/parser/JavaParserTest.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/java/parser/JavaParserTest.java b/jaxx-compiler/src/test/java/jaxx/compiler/java/parser/JavaParserTest.java index b82a862..a364da3 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/java/parser/JavaParserTest.java +++ b/jaxx-compiler/src/test/java/jaxx/compiler/java/parser/JavaParserTest.java @@ -1,5 +1,27 @@ package jaxx.compiler.java.parser; +/* + * #%L + * JAXX :: Compiler + * %% + * Copyright (C) 2008 - 2015 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import jaxx.compiler.CompilerException; import jaxx.compiler.reflect.ClassDescriptor; import jaxx.compiler.reflect.MethodDescriptor; -- 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 http://git.nuiton.org/jaxx.git commit 8523410a2659d66f8d196a87ca48d032f078e136 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 12:25:39 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.24' 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-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 5a1f068..f1519ee 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.24-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index 1164166..4118475 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.24-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 9e3677f..88cb6dd 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.24-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index 2e5ef01..66fb150 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.24-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index e4b1927..25b5481 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.24-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index ea0d3e8..2f64dba 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.24-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index f75bb0b..c5c6060 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.24-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index 540be52..feb8a00 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.24-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-common/pom.xml b/jaxx-widgets-common/pom.xml index 182aae3..5de9d8e 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.24-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index d1c6159..a480079 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.24-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index 3be9555..dde0c20 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.24-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index 019a358..616bbb4 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.24-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-number/pom.xml b/jaxx-widgets-number/pom.xml index 26e4078..19e1284 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.24-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-select/pom.xml b/jaxx-widgets-select/pom.xml index 84e303b..83513d8 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.24-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 985783e..90ff702 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.24-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index fc5861c..b58b6ee 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.24-SNAPSHOT</version> + <version>2.24</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 http://git.nuiton.org/jaxx.git commit 9e7f68abc7baa2be8763335e8f5ad9df9ba4844d Merge: f715774 8523410 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 12:31:59 2015 +0000 Merge branch 'release/2.24' into master-2.x jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 13 +- .../java/jaxx/compiler/java/parser/JavaParser.java | 114 +++++++++++++++- .../ClassDescriptorResolverFromJavaFile.java | 14 +- .../jaxx/compiler/java/parser/JavaParserTest.java | 128 ++++++++++++++++++ jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- .../jaxx/widgets/gis/CoordinatesEditorDemo.css | 6 + .../jaxx/widgets/gis/CoordinatesEditorDemo.jaxx | 1 + .../main/resources/i18n/jaxx-demo_en_GB.properties | 1 + .../main/resources/i18n/jaxx-demo_es_ES.properties | 1 + .../main/resources/i18n/jaxx-demo_fr_FR.properties | 1 + jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- .../java/jaxx/runtime/swing/BlockingLayerUI.java | 143 +++++++++++---------- 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/gis/DdCoordinateConverter.java | 15 ++- .../jaxx/widgets/gis/DmdCoordinateConverter.java | 18 ++- .../jaxx/widgets/gis/DmsCoordinateConverter.java | 18 ++- .../gis/absolute/AbsoluteDdCoordinateEditor.jaxx | 1 + .../AbsoluteDdCoordinateEditorHandler.java | 27 ++++ .../gis/absolute/AbsoluteDmdCoordinateEditor.jaxx | 1 + .../AbsoluteDmdCoordinateEditorHandler.java | 27 ++++ .../gis/absolute/AbsoluteDmsCoordinateEditor.jaxx | 1 + .../AbsoluteDmsCoordinateEditorHandler.java | 29 ++++- .../widgets/gis/absolute/CoordinatesEditor.css | 6 + .../widgets/gis/absolute/CoordinatesEditor.jaxx | 2 + .../gis/absolute/CoordinatesEditorModel.java | 48 +++++++ .../gis/signed/SignedDdCoordinateEditor.jaxx | 1 + .../signed/SignedDdCoordinateEditorHandler.java | 28 ++++ .../gis/signed/SignedDmdCoordinateEditor.jaxx | 1 + .../signed/SignedDmdCoordinateEditorHandler.java | 28 ++++ .../gis/signed/SignedDmsCoordinateEditor.jaxx | 1 + .../signed/SignedDmsCoordinateEditorHandler.java | 28 ++++ jaxx-widgets-number/pom.xml | 2 +- jaxx-widgets-select/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 8 +- 43 files changed, 623 insertions(+), 115 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 http://git.nuiton.org/jaxx.git commit ca75717edf0efae486e24dd19cc92a5876cfa0f5 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 12:32:05 2015 +0000 [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 d539ccb..f1519ee 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.25-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index 8330a46..4118475 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.25-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 4b6675a..88cb6dd 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.25-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index c7140ad..66fb150 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.25-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 04b7711..25b5481 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.25-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index 942e121..2f64dba 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.25-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index 4844b66..c5c6060 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.25-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index c26d0ff..feb8a00 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.25-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-common/pom.xml b/jaxx-widgets-common/pom.xml index 53b05da..5de9d8e 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.25-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index dca0865..a480079 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.25-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index 12f966c..dde0c20 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.25-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index 0a9664a..616bbb4 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.25-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-number/pom.xml b/jaxx-widgets-number/pom.xml index c41e5c4..19e1284 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.25-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-select/pom.xml b/jaxx-widgets-select/pom.xml index 2ebfd73..83513d8 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.25-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index e07d781..90ff702 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.25-SNAPSHOT</version> + <version>2.24</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index 0ed2360..b58b6ee 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.25-SNAPSHOT</version> + <version>2.24</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 http://git.nuiton.org/jaxx.git commit dabedfb77cbebf05bd83cdcc4035e5bb20884457 Merge: ca75717 9e7f68a Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 12:32:06 2015 +0000 Merge branch 'master-2.x' into develop-2.x .../jaxx/compiler/java/parser/JavaParserTest.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 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 http://git.nuiton.org/jaxx.git commit 6aacd90b844f17790ebba4407eaa80c950885b1b Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 23 12:32:07 2015 +0000 [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 f1519ee..d539ccb 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.24</version> + <version>2.25-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-application-swing/pom.xml b/jaxx-application-swing/pom.xml index 4118475..8330a46 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.24</version> + <version>2.25-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-compiler/pom.xml b/jaxx-compiler/pom.xml index 88cb6dd..4b6675a 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.24</version> + <version>2.25-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-config/pom.xml b/jaxx-config/pom.xml index 66fb150..c7140ad 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.24</version> + <version>2.25-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-demo/pom.xml b/jaxx-demo/pom.xml index 25b5481..04b7711 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.24</version> + <version>2.25-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index 2f64dba..942e121 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.24</version> + <version>2.25-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-runtime/pom.xml b/jaxx-runtime/pom.xml index c5c6060..4844b66 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.24</version> + <version>2.25-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-validator/pom.xml b/jaxx-validator/pom.xml index feb8a00..c26d0ff 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.24</version> + <version>2.25-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-common/pom.xml b/jaxx-widgets-common/pom.xml index 5de9d8e..53b05da 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.24</version> + <version>2.25-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index a480079..dca0865 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.24</version> + <version>2.25-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-extra/pom.xml b/jaxx-widgets-extra/pom.xml index dde0c20..12f966c 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.24</version> + <version>2.25-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index 616bbb4..0a9664a 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.24</version> + <version>2.25-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-number/pom.xml b/jaxx-widgets-number/pom.xml index 19e1284..c41e5c4 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.24</version> + <version>2.25-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets-select/pom.xml b/jaxx-widgets-select/pom.xml index 83513d8..2ebfd73 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.24</version> + <version>2.25-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/jaxx-widgets/pom.xml b/jaxx-widgets/pom.xml index 90ff702..e07d781 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.24</version> + <version>2.25-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> diff --git a/pom.xml b/pom.xml index b58b6ee..0ed2360 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.24</version> + <version>2.25-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