(struts) branch fix/WW-5388-fileupload deleted (was f913c407e)

2024-02-14 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch fix/WW-5388-fileupload
in repository https://gitbox.apache.org/repos/asf/struts.git


 was f913c407e WW-5388 Fixes a few issues in Servlet 6 file upload usage - 
removes duplicated validation messages where both interceptors have been used - 
defines a proper error message on a general file upload exception - removes 
generic definition in tests

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



(struts) branch release/struts-7-0-x updated (d384c824b -> 7edcac886)

2024-02-14 Thread lukaszlenart
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 d384c824b Merge pull request #870 from 
sepe81/feature/update-log42j-for-java-version-after-8
 add f913c407e WW-5388 Fixes a few issues in Servlet 6 file upload usage - 
removes duplicated validation messages where both interceptors have been used - 
defines a proper error message on a general file upload exception - removes 
generic definition in tests
 add 7edcac886 Merge pull request #873 from apache/fix/WW-5388-fileupload

No new revisions were added by this update.

Summary of changes:
 .../multipart/AbstractMultiPartRequest.java|  46 +++---
 .../multipart/JakartaStreamMultiPartRequest.java   |  22 +--
 .../interceptor/AbstractFileUploadInterceptor.java |   3 +-
 .../struts2/interceptor/FileUploadInterceptor.java |  19 ++-
 .../org/apache/struts2/struts-messages.properties  |   3 +-
 .../multipart/AbstractMultiPartRequestTest.java|  14 ++
 .../ActionFileUploadInterceptorTest.java   | 139 
 .../interceptor/FileUploadInterceptorTest.java | 179 -
 8 files changed, 238 insertions(+), 187 deletions(-)