This is an automated email from the git hooks/post-receive script. New change to branch master in repository nuiton-web. See https://gitlab.nuiton.org/nuiton/nuiton-web.git from 2b01300 [jgitflow-maven-plugin]merging 'release/1.18' into 'master' adds e1b651b [jgitflow-maven-plugin]updating poms for 1.19-SNAPSHOT development adds 6a7fe35 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b1310b0 [jgitflow-maven-plugin]merging 'master' into 'develop' adds d254b3f [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 66baf21 Update jetty version adds b64d6ae Update and fix documentation on JettyRunner (Fixes #4126) adds befcd04 Add an extra «--start» option in JettyRuner to add extra suffix to url to open in browser (Fixes #4127) adds 91f8c45 [jgitflow-maven-plugin]updating poms for 1.20-SNAPSHOT development adds e47aef9 fixes #122: Update to struts 2.5.12 adds 7d47b76 fixes #122: Fix tests adds fc77513 fixes #123: Update libs adds 18412d3 [jgitflow-maven-plugin]updating poms for branch'release/1.19' with non-snapshot versions adds 875bd4d [jgitflow-maven-plugin]merging 'release/1.19' into 'master' No new revisions were added by this update. Summary of changes: nuiton-security/pom.xml | 2 +- nuiton-struts2/pom.xml | 2 +- .../org/nuiton/web/struts2/I18nTextProvider.java | 29 +++---- ...Converter.java => I18nTextProviderFactory.java} | 28 +++---- .../nuiton/web/struts2/I18nTextProviderTest.java | 17 +++- nuiton-web/pom.xml | 2 +- .../java/org/nuiton/web/war/JettyLauncher.java | 13 ++- nuiton-web/src/site/apt/Warlauncher.apt.vm | 70 ++-------------- pom.xml | 98 +++++++--------------- 9 files changed, 89 insertions(+), 172 deletions(-) copy nuiton-struts2/src/main/java/org/nuiton/web/struts2/{converters/HundredthLocalNumberConverter.java => I18nTextProviderFactory.java} (55%) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.