This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5411-delete-deprecated-1
in repository https://gitbox.apache.org/repos/asf/struts.git
commit fc7a0335ff1b533f519e64733a466d4503e89f59
Merge: 6cebeaca9 c965812ff
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Mon Jul 8 16:59:46 2024 +1000
Merge branch 'refs/heads/WW-5428-allowlist-hibernate' into
WW-5411-delete-deprecated-1
.../config/providers/EnvsValueSubstitutor.java | 4 +-
.../xwork2/interceptor/ValidationAware.java | 6 +-
.../xwork2/ognl/ErrorMessageBuilder.java | 4 +-
.../xwork2/ognl/SecurityMemberAccess.java | 15 +++-
.../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 ++++--
.../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 +-
16 files changed, 363 insertions(+), 122 deletions(-)
