This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5343-sec-extend
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 05a99733fbdcb7451c10cc95d427c8a4034046ce
Merge: 68f5584d9 63b0da3a7
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Fri Nov 17 15:42:45 2023 +1100
Merge branch 'master' into WW-5343-sec-extend
.asf.yaml | 4 +-
Jenkinsfile | 6 +-
.../java/org/apache/struts2/components/Set.java | 16 +-
.../struts2/{util => dispatcher}/AttributeMap.java | 72 ++--
.../org/apache/struts2/dispatcher/Dispatcher.java | 11 +-
.../struts2/dispatcher/DispatcherConstants.java | 33 ++
.../org/apache/struts2/dispatcher/RequestMap.java | 4 +-
.../debugging/DebuggingInterceptor.java | 16 +-
.../org/apache/struts2/views/jsp/TagUtils.java | 2 +-
.../org/apache/struts2/views/util/ContextUtil.java | 7 +-
.../struts2/dispatcher/AttributeMapTest.java | 363 +++++++++++++++++++++
.../portlet/dispatcher/Jsr168Dispatcher.java | 13 +-
.../views/velocity/StrutsVelocityContext.java | 47 ++-
.../views/velocity/StrutsVelocityContextTest.java | 90 +++++
14 files changed, 601 insertions(+), 83 deletions(-)
