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 875bd4d [jgitflow-maven-plugin]merging 'release/1.19' into 'master' adds 2bf6a91 [jgitflow-maven-plugin]updating poms for 1.20-SNAPSHOT development adds a282cb5 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d8ede01 [jgitflow-maven-plugin]merging 'master' into 'develop' adds cb489c7 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds f10483a Inline a method from JSONUtil that will no longer be available adds bc2ff04 Update to ToPIA 3.3, Struts 2.5.14 and other dependencies adds 558c2a0 Disable fetching changes from redmine since issues are now on gitlab adds a038222 Update to JDK8, no choice since struts 2.15.14 requires a freemarker version needing JDK8 adds 3d7e67c Downgrading log4j-api to 2.8 for struts who require 2.9: 2.9 doesn't pass the enforcer test to limit JDK8 adds 1b111a1 [jgitflow-maven-plugin]updating poms for branch'release/1.20' with non-snapshot versions adds 4c74b1b [jgitflow-maven-plugin]merging 'release/1.20' into 'master' No new revisions were added by this update. Summary of changes: nuiton-security/pom.xml | 5 ++- nuiton-struts2/pom.xml | 7 +++- .../org/nuiton/web/struts2/I18nTextProvider.java | 37 ++++++++++--------- .../web/struts2/I18nTextProviderFactory.java | 15 +++++++- .../web/struts2/converters/JsonConverter.java | 5 ++- .../nuiton/web/struts2/I18nTextProviderTest.java | 38 +++++++------------ nuiton-web/pom.xml | 2 +- pom.xml | 43 +++++++++++++++------- 8 files changed, 89 insertions(+), 63 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.