mirror of
https://github.com/apache/struts.git
synced 2026-08-11 09:36:57 +00:00
13bf91bf31
# Conflicts: # Jenkinsfile # core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java # core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java # core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java # plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java # plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java # plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java # plugins/portlet/src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java # plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java