branch develop updated (c16c257 -> f234adf)
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 c16c257 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new f234adf Improve failsIfExist flag for multi-locales builds on gen mojo (Fixes #4005) The 1 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 f234adf1d08d87614b21a58e5c32ab79ed0cc34b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 28 13:10:05 2016 +0200 Improve failsIfExist flag for multi-locales builds on gen mojo (Fixes #4005) Summary of changes: .../src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 f234adf1d08d87614b21a58e5c32ab79ed0cc34b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 28 13:10:05 2016 +0200 Improve failsIfExist flag for multi-locales builds on gen mojo (Fixes #4005) --- .../src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java index 93706ed..766a9ff 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java @@ -115,6 +115,7 @@ public class GenerateMojo extends AbstractI18nGenerateMojo { */ @Parameter(property = "i18n.keepGetters", defaultValue = "false") protected boolean keepGetters; + protected BundleValidation bundleValidation; @Override protected boolean checkSkip() { @@ -133,6 +134,9 @@ public class GenerateMojo extends AbstractI18nGenerateMojo { getLog().info("config - out basedir : " + out.getAbsolutePath()); getLog().info("config - locales : " + Arrays.toString(locales)); } + + bundleValidation = new BundleValidation(locales); + for (Locale locale : locales) { if (!silent) { getLog().info("prepare bundle for locale " + locale); @@ -188,12 +192,10 @@ public class GenerateMojo extends AbstractI18nGenerateMojo { if (checkBundle) { - BundleValidation bundleValidation = new BundleValidation(locales); ImmutableSet<String> keys = Maps.fromProperties(propertiesOut).keySet(); bundleValidation.getKeysPerLocale().putAll(locale, keys); checkBundle(locale, propertiesOut, showEmpty, bundleValidation); - failsIfWarning(failsIfWarning, bundleValidation); } @@ -215,5 +217,8 @@ public class GenerateMojo extends AbstractI18nGenerateMojo { deleteFile(bundleGetterOut); } } + + failsIfWarning(failsIfWarning, bundleValidation); + } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm