This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
from 80e83616b Merge pull request #800 from
apache/WW-5364-populate-allowlist
add 48a82fead WW-5339 Make ClassResolver a bean
add 002e598b7 WW-5339 Add option to block custom OGNL maps
new 6fcb50122 Merge pull request #806 from apache/WW-5339-astmap-block
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../xwork2/config/impl/DefaultConfiguration.java | 2 ++
.../main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java | 9 +++++----
.../opensymphony/xwork2/ognl/OgnlValueStackFactory.java | 13 ++++++-------
.../xwork2/ognl/accessor/CompoundRootAccessor.java | 15 ++++++++++++++-
.../src/main/java/org/apache/struts2/StrutsConstants.java | 2 ++
core/src/main/resources/struts-beans.xml | 3 +++
.../java/com/opensymphony/xwork2/ognl/MyCustomMap.java} | 10 +++++-----
.../java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 12 ++++++++++++
8 files changed, 49 insertions(+), 17 deletions(-)
copy
core/src/{main/java/com/opensymphony/xwork2/DefaultLocaleProviderFactory.java
=> test/java/com/opensymphony/xwork2/ognl/MyCustomMap.java} (80%)
