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 9130e3165 Merge pull request #1088 from
apache/feature/WW-5427-incompatible-improvements
add 49ddf6130 WW-5471 Marks Sitemesh plugin as deprecated
add 9f2770b2c Merge pull request #1075 from
apache/feature/WW-5471-deprecate-sitemesh
add 7deb48129 WW-3714 Deprecate and migrate Action, Interceptor, Result
add 8da6a7992 WW-3714 Deprecate and migrate ActionContext
add ae9dc42da WW-3714 Deprecate and migrate ConditionalInterceptor
add 60095a693 WW-3714 Deprecate and migrate ActionInvocation
add 272c2e7bb WW-3714 Deprecate and migrate PreResultListener
add e3fbe8835 WW-3714 Update new ActionContext with new ActionInvocation
add 36a890ba6 WW-3714 Add factory support for new Interceptor, Result
interfaces
add b622e5d72 WW-3714 Ensure ReflectionExceptionHandler, WithLazyParams,
ParamNameAwareResult marker interfaces respected
add 91154f0ec Merge branch 'kusal-depr-apis-3.5' into
7.0.x/merge-master-2024-11-01
add bbca2717f WW-3714 Deprecate and migrate ActionEventListener
add 14bd4b80c WW-3714 Deprecate and migrate ActionProxy
add 8ba8ee5fe WW-3714 Deprecate and migrate ValueStack
add 111bc2565 WW-3714 Deprecate and migrate assorted marker interfaces
add dfd07190b WW-3714 Update new ActionContext with new ValueStack
add 7ce8f484e WW-3714 Shortcut adapters
add ebedd7391 WW-3714 Marker interface migration follow-up
add 2757c2357 WW-3714 Fix replacement ValidationAware marker not recognised
add 56004a10a Merge branch 'kusal-depr-apis-5' into
7.0.x/merge-master-2024-11-01
add a623842bc WW-3714 Deprecate and migrate ActionSupport
add 9e23fbe66 WW-3714 Deprecate and migrate AbstractInterceptor and
MethodFilterInterceptor
add f95f9a7cd WW-3714 Add alternative constructors in InterceptorMapping
add deb6c09bc WW-3714 Replace deprecated APIs in new ActionSupport
add 45a1f5efc WW-3714 Deprecate and migrate assorted Interceptors
add 243244997 WW-3714 Update StrutsResultSupport to allow overriding new
signature
add a34bffdf3 Merge branch 'kusal-depr-apis-7' into
7.0.x/merge-master-2024-11-01
add 09eb28602 Initial Commit: - Fix for boundary condition bug in
JakartaMultipartRequest that results in a NPE when
struts.multipart.maxStringLength is not explicitly set, and normal fields are
processed along with a file upload. - Additional unit tests for file upload
interceptors to confirm functionality with-or-without max parameters being set
when a file upload is processed alone as well as with normal fields.
add b359da551 Merge pull request #1068 from
JCgH4164838Gh792C124B5/localS2_66_JakartaMulipartRequestFix1
add efa447af2 Merge pull request #1079 from apache/kusal-depr-apis
add d1695f7a4 Bump github/codeql-action from 3.26.12 to 3.26.13
add a28f22605 Merge pull request #1090 from
apache/dependabot/github_actions/github/codeql-action-3.26.13
add 28c8f1503 Bump maven-surefire-plugin.version from 3.5.0 to 3.5.1
add 117e84f24 Merge pull request #1092 from
apache/dependabot/maven/maven-surefire-plugin.version-3.5.1
add cf6cbf381 Bump org.apache.maven.plugins:maven-failsafe-plugin from
3.3.1 to 3.5.1
add 9b87e88bb Merge pull request #1095 from
apache/dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.5.1
add b18fbda1f Bump org.apache.maven.doxia:doxia-core from 1.12.0 to 2.0.0
add 144010c3b Merge pull request #1093 from
apache/dependabot/maven/org.apache.maven.doxia-doxia-core-2.0.0
add b488c80aa Merge pull request #1081 from apache/kusal-depr-apis-3
add 323267fa8 Merge pull request #1087 from apache/kusal-depr-apis-3.5
add 266cd1333 Merge pull request #1082 from apache/kusal-depr-apis-4
add 5b81ec085 Merge pull request #1083 from apache/kusal-depr-apis-5
add 67ee1b2d6 Merge pull request #1084 from apache/kusal-depr-apis-6
add 89bcbecc7 Merge pull request #1085 from apache/kusal-depr-apis-7
add 48ee44bbc Bump org.apache.commons:commons-lang3 from 3.15.0 to 3.17.0
add d9d580ae3 Merge pull request #1094 from
apache/dependabot/maven/org.apache.commons-commons-lang3-3.17.0
add 3f7492309 Bump github/codeql-action from 3.26.13 to 3.27.0
add b15dc458c Merge pull request #1102 from
apache/dependabot/github_actions/github/codeql-action-3.27.0
add 5b2f63fa7 Bump asm.version from 9.7 to 9.7.1
add c75ddbbf3 Merge pull request #1098 from
apache/dependabot/maven/asm.version-9.7.1
add 67e047799 WW-5476 Deprecates tag's parameters as replaced with
attributes
add 8566c1464 Merge pull request #1096 from
apache/feature/WW-5476-deprecate
add f55c404d2 Merge branch 'master' into 7.0.x/merge-master-2024-11-01
add eab6d9ef8 Fix merge errors
add 08d54d2b6 Merge pull request #1103 from
apache/7.0.x/merge-master-2024-11-01
No new revisions were added by this update.
Summary of changes:
.github/workflows/codeql.yml | 6 +-
.github/workflows/scorecards-analysis.yaml | 2 +-
apps/showcase/pom.xml | 2 +-
.../main/java/com/opensymphony/xwork2/Action.java | 70 +--
.../com/opensymphony/xwork2/ActionContext.java | 474 +++++----------------
.../opensymphony/xwork2/ActionEventListener.java | 58 ++-
.../com/opensymphony/xwork2/ActionInvocation.java | 249 +++++------
.../java/com/opensymphony/xwork2/ActionProxy.java | 151 +++----
.../com/opensymphony/xwork2/ActionSupport.java | 341 +--------------
.../xwork2/DefaultActionInvocation.java | 3 +
.../java/com/opensymphony/xwork2/ModelDriven.java | 22 +-
.../java/com/opensymphony/xwork2/Preparable.java | 17 +-
.../main/java/com/opensymphony/xwork2/Result.java | 54 +--
.../java/com/opensymphony/xwork2/Unchainable.java | 7 +-
.../java/com/opensymphony/xwork2/Validateable.java | 15 +-
.../xwork2/config/entities/InterceptorMapping.java | 10 +-
.../xwork2/factory/DefaultInterceptorFactory.java | 14 +-
.../xwork2/factory/DefaultResultFactory.java | 19 +-
.../xwork2/interceptor/AbstractInterceptor.java | 35 +-
.../xwork2/interceptor/AliasInterceptor.java | 4 +
.../xwork2/interceptor/ChainingInterceptor.java | 5 +-
.../xwork2/interceptor/ConditionalInterceptor.java | 44 +-
.../interceptor/ConversionErrorInterceptor.java | 4 +
.../interceptor/DefaultWorkflowInterceptor.java | 6 +
.../interceptor/ExceptionMappingInterceptor.java | 3 +
.../xwork2/interceptor/Interceptor.java | 237 ++---------
.../xwork2/interceptor/LoggingInterceptor.java | 3 +
.../interceptor/MethodFilterInterceptor.java | 45 +-
.../interceptor/MethodFilterInterceptorUtil.java | 124 +-----
.../xwork2/interceptor/ModelDrivenInterceptor.java | 5 +-
.../interceptor/ParameterRemoverInterceptor.java | 3 +
.../xwork2/interceptor/PreResultListener.java | 43 +-
.../interceptor/PrefixMethodInvocationUtil.java | 5 +-
.../xwork2/interceptor/PrepareInterceptor.java | 5 +-
.../xwork2/interceptor/ScopedModelDriven.java | 21 +-
.../interceptor/ScopedModelDrivenInterceptor.java | 4 +
.../interceptor/StaticParametersInterceptor.java | 4 +
.../xwork2/interceptor/ValidationAware.java | 179 ++++----
.../xwork2/interceptor/ValidationErrorAware.java | 20 +-
.../interceptor/ValidationWorkflowAware.java | 10 +-
.../xwork2/interceptor/WithLazyParams.java | 5 +-
.../com/opensymphony/xwork2/util/DebugUtils.java | 2 +-
.../xwork2/util/StrutsLocalizedTextProvider.java | 2 +-
.../com/opensymphony/xwork2/util/ValueStack.java | 257 ++++++-----
.../validator/DelegatingValidatorContext.java | 4 +-
.../xwork2/validator/ValidationInterceptor.java | 52 +--
.../xwork2 => org/apache/struts2}/Action.java | 2 +-
.../apache/struts2}/ActionContext.java | 28 +-
.../apache/struts2}/ActionEventListener.java | 8 +-
.../apache/struts2}/ActionInvocation.java | 11 +-
.../xwork2 => org/apache/struts2}/ActionProxy.java | 11 +-
.../apache/struts2}/ActionSupport.java | 20 +-
.../xwork2 => org/apache/struts2}/ModelDriven.java | 5 +-
.../xwork2 => org/apache/struts2}/Preparable.java | 4 +-
.../xwork2 => org/apache/struts2}/Result.java | 2 +-
.../xwork2 => org/apache/struts2}/Unchainable.java | 2 +-
.../apache/struts2}/Validateable.java | 4 +-
.../struts2/factory/StrutsResultFactory.java | 38 +-
.../interceptor/AbstractFileUploadInterceptor.java | 1 -
.../struts2}/interceptor/AbstractInterceptor.java | 4 +-
.../interceptor/ActionFileUploadInterceptor.java | 1 -
.../struts2}/interceptor/AliasInterceptor.java | 16 +-
.../struts2}/interceptor/ChainingInterceptor.java | 16 +-
.../interceptor/ConditionalInterceptor.java | 4 +-
.../interceptor/ConversionErrorInterceptor.java | 23 +-
.../interceptor/DefaultWorkflowInterceptor.java | 16 +-
.../interceptor/ExceptionMappingInterceptor.java | 14 +-
.../apache/struts2}/interceptor/Interceptor.java | 12 +-
.../struts2}/interceptor/LoggingInterceptor.java | 6 +-
.../interceptor/MessageStorePreResultListener.java | 1 -
.../interceptor/MethodFilterInterceptor.java | 50 +--
.../interceptor/MethodFilterInterceptorUtil.java | 8 +-
.../interceptor/ModelDrivenInterceptor.java | 17 +-
.../interceptor/ParameterRemoverInterceptor.java | 8 +-
.../struts2}/interceptor/PreResultListener.java | 10 +-
.../struts2}/interceptor/PrepareInterceptor.java | 13 +-
.../struts2}/interceptor/ScopedModelDriven.java | 8 +-
.../interceptor/ScopedModelDrivenInterceptor.java | 15 +-
.../interceptor/StaticParametersInterceptor.java | 17 +-
.../struts2/interceptor/TokenInterceptor.java | 1 -
.../struts2}/interceptor/ValidationAware.java | 2 +-
.../struts2}/interceptor/ValidationErrorAware.java | 2 +-
.../interceptor/ValidationWorkflowAware.java | 2 +-
.../apache/struts2/result/StrutsResultSupport.java | 25 +-
.../apache/struts2}/util/ValueStack.java | 7 +-
.../struts2/views/freemarker/ScopesHashModel.java | 12 +-
.../ConfigurationProviderOgnlAllowlistTest.java | 30 +-
.../ActionFileUploadInterceptorTest.java | 158 ++++++-
.../apache/struts2/views/jsp/ActionTagTest.java | 6 +-
.../interceptor/BeanValidationInterceptor.java | 2 +-
.../java/org/apache/struts2/json/JSONResult.java | 2 +-
.../struts2/json/JSONValidationInterceptor.java | 8 +-
.../apache/struts2/junit/StrutsJUnit4TestCase.java | 2 +-
.../struts2/rest/ContentTypeInterceptor.java | 2 +-
.../apache/struts2/rest/RestActionInvocation.java | 12 +-
.../struts2/rest/RestWorkflowInterceptor.java | 2 +-
.../struts2/rest/handler/XStreamHandler.java | 2 +-
pom.xml | 8 +-
98 files changed, 1295 insertions(+), 2030 deletions(-)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/Action.java (98%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/ActionContext.java (96%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/ActionEventListener.java (88%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/ActionInvocation.java (96%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/ActionProxy.java (94%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/ActionSupport.java (94%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/ModelDriven.java (86%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/Preparable.java (97%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/Result.java (98%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/Unchainable.java (96%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/Validateable.java (93%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/AbstractInterceptor.java (95%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/AliasInterceptor.java (95%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/ChainingInterceptor.java (95%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/ConditionalInterceptor.java (93%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/ConversionErrorInterceptor.java (86%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/DefaultWorkflowInterceptor.java (95%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/ExceptionMappingInterceptor.java (95%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/Interceptor.java (95%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/LoggingInterceptor.java (95%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/MethodFilterInterceptor.java (90%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/MethodFilterInterceptorUtil.java (96%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/ModelDrivenInterceptor.java (90%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/ParameterRemoverInterceptor.java (95%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/PreResultListener.java (76%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/PrepareInterceptor.java (95%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/ScopedModelDriven.java (92%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/ScopedModelDrivenInterceptor.java (90%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/StaticParametersInterceptor.java (93%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/ValidationAware.java (98%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/ValidationErrorAware.java (97%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/ValidationWorkflowAware.java (96%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/util/ValueStack.java (97%)
