This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See https://gitlab.nuiton.org/codelutin/coser.git commit ee4c85acbe35779dffbd98714117b74da1eaf96c Merge: 5810b72 e4deaf8 Author: jcouteau <couteau@codelutin.com> Date: Fri Jul 8 08:17:52 2022 +0200 Merge branch 'struts2.5' into develop coser-business/pom.xml | 4 ++-- .../fr/ifremer/coser/services/ClientResultService.java | 2 +- .../java/fr/ifremer/coser/services/ControlService.java | 8 +++++--- .../fr/ifremer/coser/util/io/OneRSufiResultFileFilter.java | 10 +++++++--- .../ifremer/coser/validators/CoserExpressionValidator.java | 4 ++++ .../java/fr/ifremer/coser/services/ControlServiceTest.java | 5 +---- coser-web/pom.xml | 4 ---- coser-web/src/main/resources/struts.xml | 4 ++-- coser-web/src/main/webapp/WEB-INF/web.xml | 6 +++--- pom.xml | 14 +------------- 10 files changed, 26 insertions(+), 35 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.