branch develop updated (f304c85 -> bc21a33)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git from f304c85 [jgitflow-maven-plugin]updating poms for 3.6.2-SNAPSHOT development new 4a80d2a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new a7c5c6c [jgitflow-maven-plugin]updating poms for branch'release/3.6.1' with non-snapshot versions new 9402707 [jgitflow-maven-plugin]merging 'release/3.6.1' into 'master' new 996bad4 [jgitflow-maven-plugin]merging 'master' into 'develop' new a25a0a0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 6e77aab [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 68ac279 Nope don't use nuiton-utils here... new 4b4f759 [jgitflow-maven-plugin]merging 'release/3.6.1' into 'master' new 39e6e2a [jgitflow-maven-plugin]merging 'master' into 'develop' new bc21a33 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 10 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 bc21a33a157071a1d3c430285b29693fd57a1c28 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:28:48 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 39e6e2a4c8e06946fb8eaefdf2a41615af435d1a Merge: 6e77aab 4b4f759 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:28:48 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 6e77aab6abb0cbeba18f9ee32a2e3d0973cd6dd5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:28:48 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 4b4f759cc663d8bfff53ea28fe4c8c6b464cac88 Merge: 9402707 68ac279 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:28:46 2016 +0200 [jgitflow-maven-plugin]merging 'release/3.6.1' into 'master' commit 68ac279520a9dc6495857c62caf02a3944e51676 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:26:49 2016 +0200 Nope don't use nuiton-utils here... commit a25a0a03ba33dc1e515c9d206e50ac5161a1caa0 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:18:14 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 996bad4ac8f728aeccd0c309470ee8cb0a25ef01 Merge: 4a80d2a 9402707 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:18:13 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 4a80d2af78ee8feab9a6ee3e4628a1b64e7f6738 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:18:12 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 94027079046f0191c4dc17fb1916c18ebe4e84ad Merge: 9621ea5 a7c5c6c Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:18:11 2016 +0200 [jgitflow-maven-plugin]merging 'release/3.6.1' into 'master' commit a7c5c6c369f59b010b518bc8a2d1c7cd90f10032 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:18:08 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.6.1' with non-snapshot versions Summary of changes: .../java/org/nuiton/i18n/plugin/GenerateI18nEnumHelperMojo.java | 9 +-------- 1 file changed, 1 insertion(+), 8 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 https://gitlab.nuiton.org/nuiton/i18n.git commit a7c5c6c369f59b010b518bc8a2d1c7cd90f10032 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:18:08 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.6.1' 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 e681bf8..f47111d 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.6.1-SNAPSHOT</version> + <version>3.6.1</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index 7ab7572..ae9c519 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.6.1-SNAPSHOT</version> + <version>3.6.1</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index fd161eb..a74cef1 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.6.1-SNAPSHOT</version> + <version>3.6.1</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 https://gitlab.nuiton.org/nuiton/i18n.git commit 94027079046f0191c4dc17fb1916c18ebe4e84ad Merge: 9621ea5 a7c5c6c Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:18:11 2016 +0200 [jgitflow-maven-plugin]merging 'release/3.6.1' into 'master' i18n-maven-plugin/pom.xml | 2 +- .../org/nuiton/i18n/plugin/AbstractI18nMojo.java | 23 +- .../i18n/plugin/GenerateI18nEnumHelperMojo.java | 278 ++++++++++++++++++--- .../java/org/nuiton/i18n/plugin/GenerateMojo.java | 27 +- .../org/nuiton/i18n/plugin/bundle/BundleMojo.java | 26 +- i18n-maven-plugin/src/site/apt/usages.apt | 83 ++++++ i18n-maven-plugin/src/site/en/apt/usages.apt | 83 ++++++ nuiton-i18n/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 477 insertions(+), 49 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 https://gitlab.nuiton.org/nuiton/i18n.git commit 4a80d2af78ee8feab9a6ee3e4628a1b64e7f6738 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:18:12 2016 +0200 [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 95462fb..f47111d 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.6.2-SNAPSHOT</version> + <version>3.6.1</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index f11b81a..ae9c519 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.6.2-SNAPSHOT</version> + <version>3.6.1</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index 7f0023b..a74cef1 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.6.2-SNAPSHOT</version> + <version>3.6.1</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 https://gitlab.nuiton.org/nuiton/i18n.git commit 996bad4ac8f728aeccd0c309470ee8cb0a25ef01 Merge: 4a80d2a 9402707 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:18:13 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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 https://gitlab.nuiton.org/nuiton/i18n.git commit a25a0a03ba33dc1e515c9d206e50ac5161a1caa0 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:18:14 2016 +0200 [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 f47111d..95462fb 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.6.1</version> + <version>3.6.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index ae9c519..f11b81a 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.6.1</version> + <version>3.6.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index a74cef1..7f0023b 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.6.1</version> + <version>3.6.2-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>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit 68ac279520a9dc6495857c62caf02a3944e51676 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:26:49 2016 +0200 Nope don't use nuiton-utils here... --- .../java/org/nuiton/i18n/plugin/GenerateI18nEnumHelperMojo.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateI18nEnumHelperMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateI18nEnumHelperMojo.java index fb59435..377633e 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateI18nEnumHelperMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateI18nEnumHelperMojo.java @@ -37,7 +37,6 @@ import org.nuiton.i18n.plugin.parser.java.Java8BaseVisitor; import org.nuiton.i18n.plugin.parser.java.Java8Lexer; import org.nuiton.i18n.plugin.parser.java.Java8Parser; import org.nuiton.plugin.PluginHelper; -import org.nuiton.util.FileUtil; import java.io.BufferedWriter; import java.io.File; @@ -61,12 +60,6 @@ import java.util.TreeSet; @Mojo(name = "generateI18nEnumHelper", defaultPhase = LifecyclePhase.GENERATE_SOURCES) public class GenerateI18nEnumHelperMojo extends AbstractI18nMojo { -// /** -// * Prefix to add to generated i18n keys. -// */ -// @Parameter(property = "i18n.prefix") -// protected String prefix; - /** * To set the package fully qualified name of the generated class. * @@ -230,7 +223,7 @@ public class GenerateI18nEnumHelperMojo extends AbstractI18nMojo { // try with antlr4 File basedir = new File(new File(new File(getProject().getBasedir(), "src"), "main"), "java"); - File file = FileUtil.getFileFromFQN(basedir, anEnumType); + File file = PluginHelper.getFile(basedir, anEnumType.trim().split("\\.")); File javaFile = new File(file.getParentFile(), file.getName() + ".java"); if (javaFile.exists()) { -- 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 https://gitlab.nuiton.org/nuiton/i18n.git commit 4b4f759cc663d8bfff53ea28fe4c8c6b464cac88 Merge: 9402707 68ac279 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:28:46 2016 +0200 [jgitflow-maven-plugin]merging 'release/3.6.1' into 'master' .../java/org/nuiton/i18n/plugin/GenerateI18nEnumHelperMojo.java | 9 +-------- 1 file changed, 1 insertion(+), 8 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 https://gitlab.nuiton.org/nuiton/i18n.git commit 6e77aab6abb0cbeba18f9ee32a2e3d0973cd6dd5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:28:48 2016 +0200 [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 95462fb..f47111d 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.6.2-SNAPSHOT</version> + <version>3.6.1</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index f11b81a..ae9c519 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.6.2-SNAPSHOT</version> + <version>3.6.1</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index 7f0023b..a74cef1 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.6.2-SNAPSHOT</version> + <version>3.6.1</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 https://gitlab.nuiton.org/nuiton/i18n.git commit 39e6e2a4c8e06946fb8eaefdf2a41615af435d1a Merge: 6e77aab 4b4f759 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:28:48 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../java/org/nuiton/i18n/plugin/GenerateI18nEnumHelperMojo.java | 9 +-------- 1 file changed, 1 insertion(+), 8 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 https://gitlab.nuiton.org/nuiton/i18n.git commit bc21a33a157071a1d3c430285b29693fd57a1c28 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 2 14:28:48 2016 +0200 [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 f47111d..95462fb 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.6.1</version> + <version>3.6.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index ae9c519..f11b81a 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.6.1</version> + <version>3.6.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index a74cef1..7f0023b 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.6.1</version> + <version>3.6.2-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