This is an automated email from the ASF dual-hosted git repository.
yasserzamani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit b387abae010a6d725743bf463d185f4c15bf592d
Merge: c0a3be9fd 059a2a611
Author: Yasser Zamani <yasserzam...@apache.org>
AuthorDate: Sun May 15 14:27:47 2022 +0430
Merge pull request #550 from apache/servlet-3
[WW-5182] Upgrade to Servlet API 3.1
apps/showcase/pom.xml | 11 +-
bundles/pom.xml | 4 +-
core/pom.xml | 11 +-
.../org/apache/struts2/components/Include.java | 15 ++
.../struts2/components/ServletUrlRenderer.java | 4 +-
.../java/org/apache/struts2/util/StrutsUtil.java | 16 ++
.../main/java/org/apache/struts2/util/URLBean.java | 17 +-
.../struts2/interceptor/CookieInterceptorTest.java | 231 +++++++++++++--------
.../views/jsp/StrutsMockServletContext.java | 159 +++++++++++++-
plugins/embeddedjsp/pom.xml | 9 -
plugins/jasperreports/pom.xml | 6 -
plugins/jfreechart/pom.xml | 18 +-
plugins/json/pom.xml | 17 +-
plugins/junit/pom.xml | 15 +-
plugins/osgi/pom.xml | 9 -
plugins/pom.xml | 2 +-
plugins/portlet-mocks/pom.xml | 13 +-
plugins/portlet/pom.xml | 16 +-
.../portlet/servlet/PortletServletContext.java | 143 +++++++++++++
.../portlet/servlet/PortletServletInputStream.java | 21 +-
.../servlet/PortletServletOutputStream.java | 15 +-
.../portlet/servlet/PortletServletRequest.java | 194 ++++++++++++-----
.../portlet/servlet/PortletServletResponse.java | 30 ++-
plugins/rest/pom.xml | 10 -
plugins/spring/pom.xml | 24 +--
plugins/testng/pom.xml | 17 +-
plugins/velocity/pom.xml | 11 +-
pom.xml | 4 +-
28 files changed, 710 insertions(+), 332 deletions(-)
