This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 0ef086c89b6c1d7ae3d71c38a1081ec2830a9946
Merge: 87f80f473 22a6ae9d6
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Mon Aug 21 21:06:20 2023 +0200
Merge pull request #731 from apache/WW-5334-velocity-manager
WW-5334 Misc VelocityManager code cleanup
.../com/opensymphony/xwork2/XWorkTestCase.java | 7 +-
.../org/apache/struts2/views/util/ContextUtil.java | 2 -
plugins/json/pom.xml | 6 -
plugins/pom.xml | 5 +
plugins/rest/pom.xml | 6 -
.../struts2/views/velocity/VelocityManager.java | 186 +++++++--------------
.../struts2/views/velocity/VelocityStrutsUtil.java | 16 +-
.../views/velocity/VelocityManagerTest.java | 116 +++++++++++++
.../views/velocity/result/VelocityResultTest.java | 102 +++++------
plugins/velocity/src/test/resources/tools.xml | 20 +++
10 files changed, 268 insertions(+), 198 deletions(-)
