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 2020/11/20 06:46:17 UTC

[struts] 01/01: Merge pull request #447 from apache/WW-5095-cherry-pick

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 5186d348d5710971bf4edc59e353e17158ca5e4a
Merge: d0b64e4 8d3393f
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Fri Nov 20 07:45:55 2020 +0100

    Merge pull request #447 from apache/WW-5095-cherry-pick
    
    [WW-5095] Cherry picks changes from 2-5-x branch

 .../org/apache/struts2/components/Component.java    | 11 ++++++++++-
 .../java/org/apache/struts2/components/UIBean.java  | 15 ++++++++-------
 .../apache/struts2/views/jsp/ui/AbstractUITag.java  |  8 ++------
 core/src/main/resources/struts-default.xml          |  7 +++++--
 .../org/apache/struts2/components/UIBeanTest.java   | 21 +++++++++++++++++++++
 .../org/apache/struts2/util/StrutsUtilTest.java     | 15 +++++++++++++++
 .../struts2/views/java/simple/AbstractTest.java     | 14 +++++++-------
 .../org/apache/struts2/StrutsJUnit4TestCase.java    |  2 ++
 8 files changed, 70 insertions(+), 23 deletions(-)