From commits-return-18517-archive-asf-public=cust-asf.ponee.io@struts.apache.org Wed Oct 30 07:18:11 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 63502180654 for ; Wed, 30 Oct 2019 08:18:11 +0100 (CET) Received: (qmail 49510 invoked by uid 500); 30 Oct 2019 07:18:10 -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 49501 invoked by uid 99); 30 Oct 2019 07:18:10 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Oct 2019 07:18:10 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 280C3805E6; Wed, 30 Oct 2019 07:18:10 +0000 (UTC) Date: Wed, 30 Oct 2019 07:18:09 +0000 To: "commits@struts.apache.org" Subject: [struts] branch struts-2-5-x updated (3651f55 -> 13cfba8) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157241988982.19237.1860870721699961559@gitbox.apache.org> From: lukaszlenart@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: struts X-Git-Refname: refs/heads/struts-2-5-x X-Git-Reftype: branch X-Git-Oldrev: 3651f55869d602d7090c01d08f59dd135635eb4e X-Git-Newrev: 13cfba86f87f33a9374d5bbe9aeb6c01811dc3a2 X-Git-NotificationType: ref_changed X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch struts-2-5-x in repository https://gitbox.apache.org/repos/asf/struts.git. from 3651f55 Merge pull request #376 from sepe81/update-jackson-to-210 new 1de94b2 WW-5041 Upgrade to OGNL 3.1.26 and adapt to its new features new d84d59f Merge branch 'struts-2-5-x' into WW-5041 new 13cfba8 Merge pull request #371 from yasserzamani/WW-5041 The 5428 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../opensymphony/xwork2/inject/ContainerImpl.java | 9 ++++-- .../com/opensymphony/xwork2/ognl/OgnlUtil.java | 16 ++++++++++ .../opensymphony/xwork2/ognl/OgnlValueStack.java | 10 ++++++- .../java/org/apache/struts2/StrutsConstants.java | 3 ++ .../org/apache/struts2/views/jsp/ui/OgnlTool.java | 7 +++++ .../org/apache/struts2/default.properties | 4 +++ core/src/main/resources/struts-default.xml | 5 ++++ .../xwork2/ognl/OgnlValueStackTest.java | 35 ++++++++++++++++++++++ .../apache/struts2/result/StreamResultTest.java | 17 +++++++---- pom.xml | 3 +- 10 files changed, 97 insertions(+), 12 deletions(-)