This is an automated email from the git hooks/post-receive script. New change to branch master in repository i18n. See http://git.nuiton.org/i18n.git from ea1d988 Merge branch 'release/3.2' adds 8ef7be8 [jgitflow-maven-plugin]updating poms for 3.3-SNAPSHOT development adds ffd1f50 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 317f476 Merge branch 'master' into develop adds 67805aa [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 3f1de9c refs #3350: Review site adds 40f58c1 refs #3350: Review site adds 29266eb refs #3356 add new csv package with the 3 new mojos + deprecates csv generation in bundle mojo adds c620165 refs #3356 improve merge mojo + add mini doc adds 4c6a79c refs #3356 : add the generated csv file in the classpath adds f44c18d fixes #3357: Remove deprecated Tapestry mojo adds 772ea4f refs #3356 : improve the way of storing the generated csv file + fix doc adds aa99cc4 fixes #3358: Sanity mojo parameters adds 0ed5ca8 Merge branch 'feature/3356' into develop adds c85d47f refs #3350: Review site adds 9a7be4d [jgitflow-maven-plugin]updating poms for branch'release/3.3' with non-snapshot versions adds 77a8a5d - optimize dependencies - fix license headers - update third parties adds cd280d7 optimize dependencies adds 343e5a2 Merge branch 'release/3.3' No new revisions were added by this update. Summary of changes: i18n-maven-plugin/pom.xml | 12 +- .../src/license/THIRD-PARTY.properties | 8 +- .../i18n/plugin/AbstractI18nGenerateMojo.java | 88 +++++++ .../org/nuiton/i18n/plugin/AbstractI18nMojo.java | 111 +------- .../java/org/nuiton/i18n/plugin/GenerateMojo.java | 35 ++- .../java/org/nuiton/i18n/plugin/GetterMojo.java | 14 +- .../main/java/org/nuiton/i18n/plugin/I18nUtil.java | 63 +++++ .../i18n/plugin/bundle/AbstractI18nBundleMojo.java | 5 +- .../plugin/bundle/AbstractMakeI18nBundleMojo.java | 284 --------------------- .../org/nuiton/i18n/plugin/bundle/BundleMojo.java | 245 +++++++++++++++++- .../plugin/bundle/CollectI18nArtifactsMojo.java | 4 + .../i18n/plugin/bundle/TapestryBundleMojo.java | 190 -------------- .../AbstractCsvBundleMojo.java} | 37 ++- .../plugin/bundle/csv/GenerateCsvBundleMojo.java | 277 ++++++++++++++++++++ .../i18n/plugin/bundle/csv/I18nBundleModel.java | 66 +++++ .../plugin/bundle/csv/I18nBundleModelRow.java} | 46 ++-- .../plugin/bundle/csv/MergeBackCsvBundleMojo.java | 147 +++++++++++ .../i18n/plugin/bundle/csv/SplitCsvBundleMojo.java | 146 +++++++++++ .../i18n/plugin/parser/AbstractI18nParserMojo.java | 34 ++- i18n-maven-plugin/src/site/apt/index.apt | 6 + i18n-maven-plugin/src/site/apt/usages.apt | 30 +++ i18n-maven-plugin/src/site/site_en.xml | 15 +- i18n-maven-plugin/src/site/site_fr.xml | 15 +- nuiton-i18n/pom.xml | 32 ++- nuiton-i18n/src/site/site_en.xml | 12 - nuiton-i18n/src/site/site_fr.xml | 12 - pom.xml | 14 +- src/site/site_en.xml | 7 +- src/site/site_fr.xml | 3 +- 29 files changed, 1258 insertions(+), 700 deletions(-) create mode 100644 i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nGenerateMojo.java create mode 100644 i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/I18nUtil.java delete mode 100644 i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java delete mode 100644 i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java copy i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/{BundleFormatConverter.java => csv/AbstractCsvBundleMojo.java} (58%) create mode 100644 i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/GenerateCsvBundleMojo.java create mode 100644 i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/I18nBundleModel.java copy i18n-maven-plugin/src/{it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java => main/java/org/nuiton/i18n/plugin/bundle/csv/I18nBundleModelRow.java} (53%) create mode 100644 i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/MergeBackCsvBundleMojo.java create mode 100644 i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/SplitCsvBundleMojo.java -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.