This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch merge-forward-master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 2190497733df27ff13955a54616b2ce99f20dbd2
Merge: ed04c009c 63b0da3a7
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Tue Nov 21 17:13:57 2023 +1100
Merge remote-tracking branch 'origin/master' into merge-forward-master
.asf.yaml | 4 +-
Jenkinsfile | 6 +-
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 78 ++++++++++++++++---
.../opensymphony/xwork2/ognl/OgnlValueStack.java | 3 +
.../xwork2/ognl/SecurityMemberAccess.java | 56 ++++++++++++--
.../java/org/apache/struts2/StrutsConstants.java | 6 ++
.../xwork2/ognl/SecurityMemberAccessTest.java | 77 ++++++++++++++++++
.../views/velocity/StrutsVelocityContext.java | 47 +++++++----
.../views/velocity/StrutsVelocityContextTest.java | 90 ++++++++++++++++++++++
9 files changed, 329 insertions(+), 38 deletions(-)
