This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git
commit 570bf46a7f1dc14c328d66cbf1f60d0246999e03 Merge: 2beac8eba b001c61f8 Author: Kusal Kithul-Godage <git...@kusal.io> AuthorDate: Sun Nov 3 18:52:42 2024 +1100 Merge pull request #1115 from apache/WW-5459-repkg-action-chain core/src/main/java/com/opensymphony/xwork2/Action.java | 4 ++-- core/src/main/java/org/apache/struts2/ActionContext.java | 1 + core/src/main/java/org/apache/struts2/ActionInvocation.java | 1 + core/src/main/java/org/apache/struts2/ActionSupport.java | 1 + core/src/main/java/org/apache/struts2/{ => action}/Action.java | 2 +- core/src/main/java/org/apache/struts2/result/Result.java | 2 +- .../config/providers/ConfigurationProviderOgnlAllowlistTest.java | 6 +++--- 7 files changed, 10 insertions(+), 7 deletions(-)