This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
from 5e187ad12 WN-5141
add 94a4f559e WW-5371 Implements action based file upload
add 86d4a5201 WW-5371 Uses the new upload mechanism in Showcase app
add 7f4c37b86 WW-5371 Simplifies file upload logic and extracts constants
add 2009e5892 WW-5371 Document how to use the new file upload logic
add e0f77c11b WW-5370 Simplifies error handling logic
add 19642a5e6 WW-5371 Migrates modern upload change to JakartaEE
add 31a582eee WW-5371 Migrates modern upload change to JakartaEE
add 83874c331 WW-5364 fixes automatically populated OGNL allowlist
add b087006a4 WW-5339 Add option to block custom OGNL maps
add 938f8eadb Adds missing import
add 576c06469 Replaces empty file upload test with simple one
add 51a173aa2 Upgrades Maven wrapper
add 660f5376e Fixes pipeline to properly handle transformed artifacts
add cd2bfee2d Merge pull request #809 from apache/fix/after-rebase
No new revisions were added by this update.
Summary of changes:
.mvn/wrapper/maven-wrapper.properties | 2 +-
Jenkinsfile | 111 ++++++++++-----------
apps/showcase/pom.xml | 8 +-
.../apache/struts2/showcase/FileUploadTest.java | 25 +++--
.../{SessionAware.java => UploadedFilesAware.java} | 22 ++--
.../multipart/AbstractMultiPartRequest.java | 2 +
.../multipart/JakartaMultiPartRequest.java | 57 ++++++-----
.../multipart/JakartaStreamMultiPartRequest.java | 13 +--
.../multipart/MultiPartRequestWrapper.java | 20 ++--
.../interceptor/ActionFileUploadInterceptor.java | 9 +-
.../org/apache/struts2/struts-messages.properties | 50 ++++++++--
.../ConfigurationProviderOgnlAllowlistTest.java | 2 +-
.../com/opensymphony/xwork2/ognl/MyCustomMap.java} | 10 +-
.../ActionFileUploadInterceptorTest.java | 97 +++++++++---------
.../interceptor/FileUploadInterceptorTest.java | 10 +-
.../util/SecurityMemberAccessInServletsTest.java | 10 +-
...clude-parent.xml => xwork-test-allowlist-2.xml} | 16 +--
...rceptors-basic.xml => xwork-test-allowlist.xml} | 24 +++--
.../org/apache/struts2/junit/StrutsTestCase.java | 1 +
19 files changed, 278 insertions(+), 211 deletions(-)
copy core/src/main/java/org/apache/struts2/action/{SessionAware.java =>
UploadedFilesAware.java} (57%)
copy
core/src/{main/java/com/opensymphony/xwork2/DefaultLocaleProviderFactory.java
=> test/java/com/opensymphony/xwork2/ognl/MyCustomMap.java} (80%)
copy
core/src/test/resources/com/opensymphony/xwork2/config/providers/{xwork-include-parent.xml
=> xwork-test-allowlist-2.xml} (76%)
copy
core/src/test/resources/com/opensymphony/xwork2/config/providers/{xwork-test-interceptors-basic.xml
=> xwork-test-allowlist.xml} (70%)
