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 c087f2e64 Merge pull request #737 from apache/fix/drops-duplicated-dependency add 709434eeb WW-5336 Tidy up FreemarkerManager add e8614a99d WW-5336 Deprecate OgnlTool add 12cd92cb6 WW-5336 Clean up StrutsUtil add 85e8d819e WW-5336 Deprecate OGNL in template context add 0f068d37a WW-5336 Reduce cognitive complexity #makeSelectList add 6b13e8ac3 WW-5336 Switch to HashMap as concurrency handling not required add 35b0a6887 WW-5336 Update JavaDoc VelocityManager add 3b515b1a7 WW-5336 Fix visibility warnings add 215541146 WW-5336 Correct assertions and add test case add 6e5a1a07f WW-5336 Move XML comment to be clearer add 555a3a37b Merge pull request #735 from apache/WW-5336-deprecate-ognltool No new revisions were added by this update. Summary of changes: .../java/org/apache/struts2/util/StrutsUtil.java | 171 ++++++++++----------- .../views/freemarker/FreemarkerManager.java | 40 +++-- .../org/apache/struts2/views/jsp/ui/OgnlTool.java | 10 +- .../org/apache/struts2/views/util/ContextUtil.java | 6 +- core/src/main/resources/struts-beans.xml | 1 + core/src/main/resources/struts.vm | 2 +- .../org/apache/struts2/util/StrutsUtilTest.java | 92 ++++++++--- .../struts2/views/velocity/VelocityManager.java | 24 +-- .../views/velocity/VelocityManagerTest.java | 3 +- 9 files changed, 200 insertions(+), 149 deletions(-)