You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@struts.apache.org by lu...@apache.org on 2019/10/30 07:18:09 UTC

[struts] branch struts-2-5-x updated (3651f55 -> 13cfba8)

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(-)