This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit e14a73dea2e40d70c8b7cc346040b2202aa022e7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 5 08:31:49 2016 +0100 Correction des dépendences et ajout entete de license --- echobase-ui/pom.xml | 7 +++---- echobase-ui/src/main/resources/struts.properties | 20 ++++++++++++++++++++ pom.xml | 9 ++++++++- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index c3c94af..88cb10d 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -251,7 +251,7 @@ </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-runner</artifactId> </dependency> @@ -415,9 +415,8 @@ <!-- Compile jsp for embedded war --> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jspc-maven-plugin</artifactId> - <version>${jettyPluginVersion}</version> <executions> <execution> <id>jspc</id> @@ -502,7 +501,7 @@ </includes> </overlay> <overlay> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-runner</artifactId> <type>jar</type> </overlay> diff --git a/echobase-ui/src/main/resources/struts.properties b/echobase-ui/src/main/resources/struts.properties index b81e8b2..6715f66 100644 --- a/echobase-ui/src/main/resources/struts.properties +++ b/echobase-ui/src/main/resources/struts.properties @@ -1,2 +1,22 @@ +### +# #%L +# EchoBase :: UI +# %% +# Copyright (C) 2011 - 2016 Ifremer, Codelutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### #Ne pas déplacer dans le fichier xml car ce fichier est lue au démarrage de l'application struts.multipart.maxSize=419430400 diff --git a/pom.xml b/pom.xml index 02e4815..b11c460 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,7 @@ <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonWebVersion>1.16</nuitonWebVersion> + <jettyJspcPluginVersion>9.3.6.v20151106</jettyJspcPluginVersion> <!--<struts2Version>2.3.20</struts2Version>--> <struts2Version>2.3.15.3</struts2Version> <!--<jqueryPluginVersion>3.7.1</jqueryPluginVersion>--> @@ -397,7 +398,7 @@ </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-runner</artifactId> <version>${jettyPluginVersion}</version> <scope>provided</scope> @@ -489,6 +490,12 @@ <version>${nuitonI18nVersion}</version> </plugin> + <plugin> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jspc-maven-plugin</artifactId> + <version>${jettyJspcPluginVersion}</version> + </plugin> + </plugins> </pluginManagement> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.