This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git
from b65005c72 Merge pull request #980 from apache/7.0.x/merge-master-2024-07-08 add 4944f1838 WW-5411 Delete deprecated methods from OgnlValueStack add ead66f2f7 WW-5411 Delete deprecated methods from cache factories and OgnlUtil constructor add c801c8a74 WW-5411 Delete deprecated methods from OgnlUtil add e3624835f WW-5411 Delete deprecated members from prepare filters add 1b8e7ac82 WW-5411 Delete misc deprecated methods from 6.2.0 add 31bdbfc27 WW-5411 Delete deprecated Velocity injection methods add 61d593620 WW-5411 Delete misc deprecated methods from 6.4.0 add 089f620ea WW-5411 Delete deprecated Aware marker interfaces add a3cc0422f WW-5411 Delete more deprecated methods from OgnlUtil add 70b5d7c83 Merge pull request #981 from apache/WW-5411-delete-deprecated-1 No new revisions were added by this update. Summary of changes: .../config/providers/XmlConfigurationProvider.java | 8 -- .../providers/XmlDocConfigurationProvider.java | 23 +-- .../ognl/DefaultOgnlBeanInfoCacheFactory.java | 7 - .../xwork2/ognl/DefaultOgnlCacheFactory.java | 49 +------ .../ognl/DefaultOgnlExpressionCacheFactory.java | 7 - .../opensymphony/xwork2/ognl/OgnlCacheFactory.java | 24 ---- .../com/opensymphony/xwork2/ognl/OgnlUtil.java | 155 --------------------- .../opensymphony/xwork2/ognl/OgnlValueStack.java | 45 ------ .../xwork2/ognl/OgnlValueStackFactory.java | 9 -- .../java/org/apache/struts2/StrutsConstants.java | 14 -- .../config/StrutsXmlConfigurationProvider.java | 10 +- .../org/apache/struts2/dispatcher/Dispatcher.java | 24 +--- .../apache/struts2/dispatcher/InitOperations.java | 16 --- .../struts2/dispatcher/PrepareOperations.java | 20 +-- .../filter/StrutsPrepareAndExecuteFilter.java | 27 ++-- .../dispatcher/filter/StrutsPrepareFilter.java | 21 +-- .../ActionMappingParametersInterceptor.java | 2 +- .../struts2/interceptor/ApplicationAware.java | 32 ----- .../struts2/interceptor/CookieInterceptor.java | 5 +- .../apache/struts2/interceptor/CookiesAware.java | 40 ------ .../struts2/interceptor/HttpParametersAware.java | 32 ----- .../apache/struts2/interceptor/ParameterAware.java | 36 ----- .../apache/struts2/interceptor/PrincipalAware.java | 30 ---- .../apache/struts2/interceptor/RequestAware.java | 41 ------ .../interceptor/ServletConfigInterceptor.java | 10 +- .../struts2/interceptor/ServletRequestAware.java | 32 ----- .../struts2/interceptor/ServletResponseAware.java | 32 ----- .../apache/struts2/interceptor/SessionAware.java | 32 ----- .../parameter/ParametersInterceptor.java | 28 +--- .../xwork2/DefaultActionInvocationTest.java | 14 +- .../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 44 ++++-- .../xwork2/ognl/OgnlValueStackTest.java | 2 +- .../struts2/interceptor/CookieInterceptorTest.java | 87 +----------- .../parameter/ParametersInterceptorTest.java | 33 ++--- .../struts2/rest/RestActionInvocationTest.java | 72 +++++----- .../OldDecorator2NewStrutsVelocityDecorator.java | 17 +-- .../struts2/sitemesh/VelocityPageFilter.java | 14 +- .../views/velocity/result/VelocityResult.java | 33 +---- .../velocity/template/VelocityTemplateEngine.java | 15 +- 39 files changed, 149 insertions(+), 993 deletions(-) delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/ApplicationAware.java delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/HttpParametersAware.java delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/PrincipalAware.java delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/RequestAware.java delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/ServletRequestAware.java delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/ServletResponseAware.java delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/SessionAware.java