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 5ebd716fb7ffe10c6f1857c993285c63ab57f838 Merge: 05829e3 b165582 Author: Yasser Zamani <yasser.zam...@live.com> AuthorDate: Tue Apr 24 13:13:56 2018 +0430 Merge pull request #216 from lukaszlenart/javaee5 Upgrade to Java EE5 apps/rest-showcase/src/main/webapp/WEB-INF/web.xml | 11 +- apps/showcase/src/main/webapp/WEB-INF/web.xml | 7 +- core/pom.xml | 2 +- ...rutsPrepareAndExecuteFilterIntegrationTest.java | 39 +- .../{ng => }/TwoFilterIntegrationTest.java | 2 +- plugins/convention/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml | 2 +- plugins/junit/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- .../portlet/servlet/PortletServletContext.java | 403 +++++++++++---------- plugins/sitegraph/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- pom.xml | 13 +- 17 files changed, 267 insertions(+), 230 deletions(-) -- To stop receiving notification emails like this one, please contact yasserzam...@apache.org.