This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit 93a8752bbd25838b1ad13840b2737f6a98577499 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Mar 20 11:58:46 2017 +0100 fixes #1387: Update to struts 2.3.32 --- bow-extension-chromium/pom.xml | 21 +++++++++++ bow-ui/pom.xml | 21 +++++++++++ bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp | 4 +- pom.xml | 45 ++++++++++++++++------- 4 files changed, 75 insertions(+), 16 deletions(-) diff --git a/bow-extension-chromium/pom.xml b/bow-extension-chromium/pom.xml index 7432b07..3d9276a 100644 --- a/bow-extension-chromium/pom.xml +++ b/bow-extension-chromium/pom.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + BOW :: Chromium extension + %% + Copyright (C) 2011 - 2017 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% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index 9450166..40d0598 100644 --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + BOW UI + %% + Copyright (C) 2010 - 2017 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% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp index 0fc62f8..7f4a24a 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp @@ -25,10 +25,10 @@ xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> <p> - <a shape="rect" href="http://www.chorem.org/projects/show/bow">bow</a> + <a shape="rect" href="http://www.chorem.org/projects/bow">bow</a> <a shape="rect" href="http://www.chorem.org/projects/bow/files"></a> - <a shape="rect" href="http://www.gnu.org/licenses/agpl.html"><s:text name="bow.footer.license" /></a> - - <span title="Copyright">©2010-2015</span> + <span title="Copyright">©2010-2017</span> <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> - <a shape="rect" href="http://www.chorem.org/projects/bow/issues"><s:text name="bow.footer.bugreport" /></a> - <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users"><s:text name="bow.footer.userSupport" /></a> - diff --git a/pom.xml b/pom.xml index 41bf716..313b66b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + bow + %% + Copyright (C) 2010 - 2017 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% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>chorempom</artifactId> - <version>9</version> + <version>10.5</version> </parent> <groupId>org.chorem</groupId> @@ -49,18 +70,6 @@ <role>Developer</role> </roles> </developer> - - <developer> - <id>tchemit</id> - <name>Tony Chemit</name> - <email>chemit@codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://codelutin.com</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>Developer</role> - </roles> - </developer> </developers> <contributors> @@ -87,6 +96,14 @@ <role>Developer</role> </roles> </contributor> + + <contributor> + <name>Tony Chemit</name> + <timezone>Europe/Paris</timezone> + <roles> + <role>Developer</role> + </roles> + </contributor> </contributors> <modules> @@ -111,7 +128,7 @@ <nuitonI18nVersion>3.3</nuitonI18nVersion> <wikittyVersion>3.13</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> - <struts2Version>2.3.24</struts2Version> + <struts2Version>2.3.32</struts2Version> <struts2jqueryVersion>3.7.1</struts2jqueryVersion> <htmlParserVersion>1.6</htmlParserVersion> <javaxMailVersion>1.4.3</javaxMailVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.