Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 643371007E for ; Tue, 2 Dec 2014 09:56:30 +0000 (UTC) Received: (qmail 65475 invoked by uid 500); 2 Dec 2014 09:56:29 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 65369 invoked by uid 500); 2 Dec 2014 09:56:29 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 65156 invoked by uid 99); 2 Dec 2014 09:56:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2014 09:56:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0074F9B813F; Tue, 2 Dec 2014 09:56:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Tue, 02 Dec 2014 09:56:34 -0000 Message-Id: In-Reply-To: <17d29b929e594b9a9c4e57ca9d3646a5@git.apache.org> References: <17d29b929e594b9a9c4e57ca9d3646a5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/11] struts git commit: Merge branch 'release/2.3.20' Merge branch 'release/2.3.20' Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/2886a309 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/2886a309 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/2886a309 Branch: refs/heads/master Commit: 2886a30917e30e0da223d8d600d2ed0ce6a40d51 Parents: aebdad9 5078537 Author: Lukasz Lenart Authored: Fri Nov 21 21:53:36 2014 +0100 Committer: Lukasz Lenart Committed: Fri Nov 21 21:53:36 2014 +0100 ---------------------------------------------------------------------- apps/blank/pom.xml | 2 +- apps/jboss-blank/pom.xml | 2 +- apps/mailreader/pom.xml | 2 +- apps/pom.xml | 2 +- apps/portlet/pom.xml | 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- archetypes/pom.xml | 2 +- archetypes/struts2-archetype-angularjs/pom.xml | 2 +- archetypes/struts2-archetype-blank/pom.xml | 2 +- archetypes/struts2-archetype-convention/pom.xml | 2 +- archetypes/struts2-archetype-dbportlet/pom.xml | 2 +- archetypes/struts2-archetype-plugin/pom.xml | 2 +- archetypes/struts2-archetype-portlet/pom.xml | 2 +- archetypes/struts2-archetype-starter/pom.xml | 2 +- assembly/pom.xml | 2 +- bom/pom.xml | 4 ++-- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml | 2 +- bundles/pom.xml | 2 +- core/pom.xml | 2 +- core/src/main/java/org/apache/struts2/util/TokenHelper.java | 3 ++- .../org/apache/struts2/views/freemarker/FreemarkerResult.java | 5 +---- plugins/cdi/pom.xml | 2 +- plugins/codebehind/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dojo/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/jsf/pom.xml | 2 +- plugins/json/pom.xml | 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml | 2 +- plugins/oval/pom.xml | 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml | 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml | 2 +- plugins/spring/pom.xml | 2 +- plugins/struts1/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/tiles3/pom.xml | 2 +- pom.xml | 2 +- xwork-core/pom.xml | 2 +- 54 files changed, 57 insertions(+), 59 deletions(-) ----------------------------------------------------------------------