branch develop updated (375dca5 -> 0081f80)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository i18n. See http://git.nuiton.org/i18n.git from 375dca5 [jgitflow-maven-plugin]updating poms for 3.5-SNAPSHOT development new 91bbf01 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new ba97845 Optimize thrid parties new 3e8ceb2 [jgitflow-maven-plugin]updating poms for branch'release/3.4' with non-snapshot versions new e8cf9aa [jgitflow-maven-plugin]merging 'release/3.4' into 'master' new 3bb5f29 [jgitflow-maven-plugin]merging 'master' into 'develop' new 0081f80 [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 0081f8099e63ded6f073d24c3a838c4e9216050a Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:40:48 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3bb5f29925679f9f4b17bdf21721a643f2b11a8c Merge: 91bbf01 e8cf9aa Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:40:47 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 91bbf0168f6dfbad715f76df84c67a9cc554d906 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:40:47 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit e8cf9aa60171e92b50dec384de9ab971065c9827 Merge: 343e5a2 3e8ceb2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:40:45 2016 +0100 [jgitflow-maven-plugin]merging 'release/3.4' into 'master' commit 3e8ceb2dfaa2800fc0ca1e80d747c8728ce727cb Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:39:16 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/3.4' with non-snapshot versions commit ba978450e762691285ba7b1e68f7d754c42b3b71 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:39:00 2016 +0100 Optimize thrid parties Summary of changes: i18n-maven-plugin/src/license/THIRD-PARTY.properties | 7 ++----- 1 file changed, 2 insertions(+), 5 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 in repository i18n. See http://git.nuiton.org/i18n.git commit ba978450e762691285ba7b1e68f7d754c42b3b71 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:39:00 2016 +0100 Optimize thrid parties --- i18n-maven-plugin/src/license/THIRD-PARTY.properties | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/i18n-maven-plugin/src/license/THIRD-PARTY.properties b/i18n-maven-plugin/src/license/THIRD-PARTY.properties index db5e303..b0701e6 100644 --- a/i18n-maven-plugin/src/license/THIRD-PARTY.properties +++ b/i18n-maven-plugin/src/license/THIRD-PARTY.properties @@ -4,7 +4,7 @@ # - BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 +# - Eclipse Public License 1.0 # - Eclipse Public License, Version 1.0 # - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 @@ -16,12 +16,9 @@ # - Public Domain # - The Apache Software License, Version 2.0 # - The BSD License -# - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Aug 01 08:29:40 CEST 2014 -classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html +#Mon Feb 29 16:35:37 CET 2016 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 -- 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 in repository i18n. See http://git.nuiton.org/i18n.git commit 3e8ceb2dfaa2800fc0ca1e80d747c8728ce727cb Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:39:16 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/3.4' with non-snapshot versions --- i18n-maven-plugin/pom.xml | 2 +- nuiton-i18n/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml index 6a46092..b3cd745 100644 --- a/i18n-maven-plugin/pom.xml +++ b/i18n-maven-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.4</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index b0c460d..a07fd53 100644 --- a/nuiton-i18n/pom.xml +++ b/nuiton-i18n/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.4</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index bde3806..15032a9 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.4</version> <packaging>pom</packaging> <name>I18n</name> <description>Nuiton i18n tools</description> -- 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 in repository i18n. See http://git.nuiton.org/i18n.git commit e8cf9aa60171e92b50dec384de9ab971065c9827 Merge: 343e5a2 3e8ceb2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:40:45 2016 +0100 [jgitflow-maven-plugin]merging 'release/3.4' into 'master' .gitignore | 6 +- README.txt => README.md | 0 i18n-maven-plugin/{README.txt => README.md} | 0 i18n-maven-plugin/pom.xml | 15 +- .../src/it/ano-1494/{README.txt => README.md} | 0 .../ano-1494/iso-8859-1/{README.txt => README.md} | 0 .../java/org/nuiton/i18n/MessageConstants.java | 3 +- .../it/ano-1494/migrate/{README.txt => README.md} | 0 .../java/org/nuiton/i18n/MessageConstants.java | 2 +- .../it/ano-1494/utf-8/{README.txt => README.md} | 0 .../java/org/nuiton/i18n/MessageConstants.java | 2 +- .../src/test/java/org/nuiton/i18n/ReadTest.java | 2 +- .../src/it/ano-672/{README.txt => README.md} | 0 i18n-maven-plugin/src/it/ano-672/pom.xml | 4 +- .../src/it/evo-1507/{README.txt => README.md} | 0 .../org/nuiton/i18n/ReadMessageFormatTest.java | 2 +- .../parsers/newProject/{README.txt => README.md} | 0 .../parsers/withNewKeys/{README.txt => README.md} | 0 .../src/license/THIRD-PARTY.properties | 7 +- i18n-maven-plugin/src/main/antlr4/Java.g4 | 1020 -- i18n-maven-plugin/src/main/antlr4/Java8.g4 | 1779 ++ .../i18n/plugin/AbstractI18nGenerateMojo.java | 4 +- .../org/nuiton/i18n/plugin/AbstractI18nMojo.java | 14 +- .../java/org/nuiton/i18n/plugin/GenerateMojo.java | 14 +- .../java/org/nuiton/i18n/plugin/GetterMojo.java | 2 +- .../i18n/plugin/bundle/AbstractI18nBundleMojo.java | 4 +- .../i18n/plugin/bundle/AvailableConverterMojo.java | 4 +- .../i18n/plugin/bundle/BundleFormatConverter.java | 6 +- .../org/nuiton/i18n/plugin/bundle/BundleMojo.java | 32 +- .../plugin/bundle/CollectI18nArtifactsMojo.java | 79 +- .../nuiton/i18n/plugin/bundle/I18nArtifact.java | 2 +- .../StringFormatToMessageFormatConverter.java | 6 +- .../plugin/bundle/csv/GenerateCsvBundleMojo.java | 18 +- .../plugin/bundle/csv/MergeBackCsvBundleMojo.java | 6 +- .../i18n/plugin/bundle/csv/SplitCsvBundleMojo.java | 8 +- .../i18n/plugin/parser/AbstractFileParser.java | 4 +- .../i18n/plugin/parser/AbstractI18nParserMojo.java | 12 +- .../org/nuiton/i18n/plugin/parser/FileParser.java | 4 +- .../plugin/parser/I18nParserConfiguration.java | 2 +- .../nuiton/i18n/plugin/parser/I18nSourceEntry.java | 2 +- .../nuiton/i18n/plugin/parser/ParserExecutor.java | 8 +- .../org/nuiton/i18n/plugin/parser/SourceEntry.java | 12 +- .../plugin/parser/impl/AbstractParserXmlMojo.java | 8 +- .../i18n/plugin/parser/impl/ParserGWTJavaMojo.java | 55 +- .../i18n/plugin/parser/impl/ParserJavaMojo.java | 121 +- .../i18n/plugin/parser/impl/ParserStruts2Mojo.java | 4 +- .../plugin/parser/impl/ParserValidationMojo.java | 8 +- .../i18n/plugin/parser/impl/ParserXmlUserMojo.java | 4 +- .../i18n/plugin/parser/impl/ProcessorHelper.java | 4 +- .../parser/java/{JavaLexer.tokens => Java8.tokens} | 334 +- .../i18n/plugin/parser/java/Java8BaseVisitor.java | 1700 ++ .../nuiton/i18n/plugin/parser/java/Java8Lexer.java | 600 + .../parser/java/{Java.tokens => Java8Lexer.tokens} | 334 +- .../i18n/plugin/parser/java/Java8Parser.java | 18019 +++++++++++++++++++ .../i18n/plugin/parser/java/Java8Visitor.java | 1462 ++ .../i18n/plugin/parser/java/JavaBaseListener.java | 1376 -- .../i18n/plugin/parser/java/JavaBaseVisitor.java | 846 - .../nuiton/i18n/plugin/parser/java/JavaLexer.java | 570 - .../i18n/plugin/parser/java/JavaListener.java | 1145 -- .../nuiton/i18n/plugin/parser/java/JavaParser.java | 8384 --------- .../i18n/plugin/parser/java/JavaVisitor.java | 744 - .../StringFormatToMessageFormatConverterTest.java | 4 +- .../nuiton/i18n/plugin/parser/SourceEntryTest.java | 2 +- .../plugin/parser/impl/GWTJavaFileParserTest.java | 2 +- .../plugin/parser/impl/JavaFileParserTest.java | 91 +- .../parser/impl/Struts2JspFileParserTest.java | 2 +- .../README.txt => nuiton-i18n-editor/README.md | 0 nuiton-i18n-editor/pom.xml | 8 +- .../java/org/nuiton/i18n/editor/I18nEditor.java | 2 +- .../org/nuiton/i18n/editor/I18nEditorConfig.java | 2 +- .../org/nuiton/i18n/editor/I18nEditorContext.java | 6 +- .../i18n/editor/project/AbstractI18nProject.java | 2 +- .../project/AbstractI18nProjectProvider.java | 2 +- .../nuiton/i18n/editor/project/I18nProject.java | 2 +- .../project/I18nProjectConfigurePanelUI.java | 2 +- .../i18n/editor/project/I18nProjectFactory.java | 2 +- .../i18n/editor/project/I18nProjectProvider.java | 2 +- .../editor/project/impl/DirectoryI18nProject.java | 2 +- .../project/impl/DirectoryI18nProjectProvider.java | 2 +- .../i18n/editor/project/impl/JarI18nProject.java | 2 +- .../project/impl/JarI18nProjectProvider.java | 2 +- .../nuiton/i18n/editor/ui/I18nEditorUIHandler.java | 8 +- .../org/nuiton/i18n/editor/ui/TreeModelMode.java | 2 +- .../i18n/editor/ui/project/ProjectUIModel.java | 2 +- .../editor/ui/project/SelectBundlesTableModel.java | 2 +- .../README.txt => nuiton-i18n/README.md | 0 nuiton-i18n/pom.xml | 2 +- .../src/main/java/org/nuiton/i18n/CountryEnum.java | 8 +- .../src/main/java/org/nuiton/i18n/I18n.java | 48 +- .../org/nuiton/i18n/I18nDefaultTooltipFilter.java | 4 +- .../src/main/java/org/nuiton/i18n/I18nFilter.java | 2 +- .../main/java/org/nuiton/i18n/I18nLanguage.java | 4 +- .../src/main/java/org/nuiton/i18n/I18nStore.java | 14 +- .../src/main/java/org/nuiton/i18n/I18nUtil.java | 8 +- .../main/java/org/nuiton/i18n/LanguageEnum.java | 4 +- .../java/org/nuiton/i18n/bundle/I18nBundle.java | 18 +- .../org/nuiton/i18n/bundle/I18nBundleEntry.java | 12 +- .../org/nuiton/i18n/bundle/I18nBundleScope.java | 28 +- .../org/nuiton/i18n/bundle/I18nBundleUtil.java | 20 +- .../java/org/nuiton/i18n/bundle/package-info.java | 2 +- .../nuiton/i18n/format/I18nMessageFormatter.java | 12 +- .../format/MessageFormatI18nMessageFormatter.java | 2 +- .../format/StringFormatI18nMessageFormatter.java | 2 +- .../java/org/nuiton/i18n/format/package-info.java | 2 +- .../nuiton/i18n/init/ClassPathI18nInitializer.java | 6 +- .../nuiton/i18n/init/DefaultI18nInitializer.java | 2 +- .../java/org/nuiton/i18n/init/I18nInitializer.java | 4 +- .../org/nuiton/i18n/init/UserI18nInitializer.java | 6 +- .../java/org/nuiton/i18n/init/package-info.java | 2 +- .../main/java/org/nuiton/i18n/package-info.java | 2 +- .../org/nuiton/util/converter/LocaleConverter.java | 2 +- .../org/nuiton/util/converter/package-info.java | 2 +- .../test/java/org/nuiton/i18n/I18nStoreTest.java | 2 +- .../src/test/java/org/nuiton/i18n/I18nTest.java | 2 +- .../nuiton/i18n/bundle/I18nBundleScopeTest.java | 2 +- .../nuiton/util/converter/LocaleConverterTest.java | 2 +- pom.xml | 76 +- src/site/site_en.xml | 28 +- src/site/site_fr.xml | 14 +- 119 files changed, 24445 insertions(+), 14855 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 in repository i18n. See http://git.nuiton.org/i18n.git commit 91bbf0168f6dfbad715f76df84c67a9cc554d906 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:40:47 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- i18n-maven-plugin/pom.xml | 2 +- nuiton-i18n/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml index cc9dce8..b3cd745 100644 --- a/i18n-maven-plugin/pom.xml +++ b/i18n-maven-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index af316f0..a07fd53 100644 --- a/nuiton-i18n/pom.xml +++ b/nuiton-i18n/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index 25383b3..15032a9 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4</version> <packaging>pom</packaging> <name>I18n</name> <description>Nuiton i18n tools</description> -- 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 in repository i18n. See http://git.nuiton.org/i18n.git commit 3bb5f29925679f9f4b17bdf21721a643f2b11a8c Merge: 91bbf01 e8cf9aa Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:40:47 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' i18n-maven-plugin/src/license/THIRD-PARTY.properties | 7 ++----- 1 file changed, 2 insertions(+), 5 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 in repository i18n. See http://git.nuiton.org/i18n.git commit 0081f8099e63ded6f073d24c3a838c4e9216050a Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:40:48 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- i18n-maven-plugin/pom.xml | 2 +- nuiton-i18n/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml index b3cd745..cc9dce8 100644 --- a/i18n-maven-plugin/pom.xml +++ b/i18n-maven-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.4</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index a07fd53..af316f0 100644 --- a/nuiton-i18n/pom.xml +++ b/nuiton-i18n/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.4</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index 15032a9..25383b3 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.4</version> + <version>3.5-SNAPSHOT</version> <packaging>pom</packaging> <name>I18n</name> <description>Nuiton i18n tools</description> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm