This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch 7.0.x/merge-master-2024-07-08
in repository https://gitbox.apache.org/repos/asf/struts.git
commit e2d5cc2bd725a0dbc9df5b64af39da2f960e61ca
Merge: 6cebeaca9 398e104fe
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Mon Jul 8 20:21:30 2024 +1000
Merge branch 'refs/heads/master' into 7.0.x/merge-master-2024-07-08
.../config/providers/EnvsValueSubstitutor.java | 4 +-
.../xwork2/interceptor/ValidationAware.java | 6 +-
.../xwork2/ognl/ErrorMessageBuilder.java | 4 +-
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 53 +++++-----
.../xwork2/ognl/SecurityMemberAccess.java | 108 ++++++++++++++++++++-
.../com/opensymphony/xwork2/util/DebugUtils.java | 42 ++++++++
.../com/opensymphony/xwork2/util/ProxyUtil.java | 33 +++++++
.../struts2/components/ServletUrlRenderer.java | 18 ++--
.../parameter/ParametersInterceptor.java | 51 +++++-----
.../views/freemarker/FreemarkerManager.java | 26 ++++-
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 36 ++++---
.../xwork2/ognl/SecurityMemberAccessTest.java | 81 +++++++++++++++-
.../parameter/ParametersInterceptorTest.java | 61 +++++++-----
.../struts2/url/StrutsQueryStringParserTest.java | 8 ++
.../org/apache/struts2/views/jsp/URLTagTest.java | 36 +++++++
.../xwork2/ognl/SecurityMemberAccessProxyTest.java | 92 +++++++++---------
plugins/tiles/pom.xml | 2 +-
pom.xml | 6 +-
18 files changed, 500 insertions(+), 167 deletions(-)
