branch develop updated (b798821 -> 26fd486)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from b798821 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 26fd486 fixes #9130: Mise à jour de struts 2.3.32 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 26fd48660c2e41bc987c8b3210719c1828618e5a Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 22 14:07:18 2017 +0100 fixes #9130: Mise à jour de struts 2.3.32 Summary of changes: echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 26fd48660c2e41bc987c8b3210719c1828618e5a Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 22 14:07:18 2017 +0100 fixes #9130: Mise à jour de struts 2.3.32 --- echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp b/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp index 226d9b4..9ea3f82 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp @@ -29,7 +29,7 @@ <li> <span style="font-size: 140%"> EchoBase <s:property value="#application.echobaseApplicationContext.configuration.applicationVersion"/> - © 2011-2016 + © 2011-2017 </span> <a href="http://www.ifremer.fr">Ifremer</a> <a href="http://www.codelutin.com" title="Code Lutin" target="_blank">Code diff --git a/pom.xml b/pom.xml index fd366dc..99d4fa4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>10</version> + <version>10.5</version> </parent> <groupId>fr.ifremer</groupId> @@ -133,7 +133,7 @@ <nuitonWebVersion>1.18</nuitonWebVersion> <!--<struts2Version>2.3.20</struts2Version>--> - <struts2Version>2.3.15.3</struts2Version> + <struts2Version>2.3.32</struts2Version> <!--<jqueryPluginVersion>3.7.1</jqueryPluginVersion>--> <jqueryPluginVersion>3.6.1</jqueryPluginVersion> <!--<h2Version>1.4.182</h2Version>--> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm