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 4939d3cef Merge pull request #893 from
gregh3269/fix-STRUTS_7_0_0_M3-upload-file-name
add ceb0a9a73 Bump net.sf.jasperreports:jasperreports from 6.20.6 to 6.21.0
add c553c93fa Merge pull request #843 from
apache/dependabot/maven/net.sf.jasperreports-jasperreports-6.21.0
add 9d2a7649c Updates link to build status on Jenkins
add 93fa72ee1 Merge pull request #878 from apache/fix/build-status
add 43d180f36 Bump org.apache.maven.doxia:doxia-core from 1.9.1 to 1.12.0
add d9ed77d3f Merge pull request #879 from
apache/dependabot/maven/org.apache.maven.doxia-doxia-core-1.12.0
add 94b2ee7ce Bump slf4j.version from 2.0.11 to 2.0.12
add 82491eff8 Merge pull request #880 from
apache/dependabot/maven/slf4j.version-2.0.12
add 8283ded5e Bump org.apache.maven.doxia:doxia-module-markdown from 1.9.1
to 1.12.0
add 3aa63e8cb Merge pull request #883 from
apache/dependabot/maven/org.apache.maven.doxia-doxia-module-markdown-1.12.0
add 1ddf446f7 Bump commons-validator:commons-validator from 1.6 to 1.8.0
add 0c4e21145 Merge pull request #882 from
apache/dependabot/maven/commons-validator-commons-validator-1.8.0
add 43f119796 Bump org.apache.commons:commons-compress from 1.25.0 to
1.26.0
add 154132d46 Merge pull request #884 from
apache/dependabot/maven/org.apache.commons-commons-compress-1.26.0
add ac6095d1a Bump maven-surefire-plugin.version from 3.0.0-M7 to 3.2.5
add 6648cbdb2 Merge pull request #886 from
apache/dependabot/maven/maven-surefire-plugin.version-3.2.5
add f45998102 WW-5401 Improves logging around wrapping request and
detecting multipart request
add c32018127 WW-5401 Fixes typo
add ac6c88ad4 WW-5401 Uses same message approach
add e08f637be Merge pull request #892 from apache/feature/WW-5401-logging
add 29422e47f WW-5364 Fix potential NPE in XmlDocConfigurationProvider
add 86aee4b0e Merge pull request #894 from apache/WW-5364-npe
add db0bd4385 Converts multiple file uploads example to use Action based
upload
add cdc931e26 Merge pull request #895 from apache/fix/file-uploads
add cda2a2b23 WW-5251 Reinstate deleted interfaces with transparent compat
add 19698e1fd WW-5251 Fix ParameterAware
add dc774c484 WW-5251 Reinstate RequestAware
add 7281d7e2e Merge pull request #898 from apache/WW-5251-retrofit-compat
add 6950fcb75 Enables required review by codeowners
add 66c1ac431 Merge pull request #899 from apache/feature/codeowners-review
add 93c11aaf6 WW-5251 Fix deprecated interface method signature
add c774e23ef Merge pull request #900 from apache/WW-5251-retrofit-compat
add c7ae61482 WW-5402 Auto loads Tiles definitions from classpath
add 689d17d27 Merge pull request #896 from
apache/feature/WW-5402-autoload-classptah
add 273c3a1a9 Uses proper context name in branch protection rule
add 5cf746f53 Merge pull request #901 from apache/fix/branch-protction
add 7a79576bb Bump log4j2.version from 2.21.1 to 2.23.1
add ee38cd5b1 Merge pull request #902 from
apache/dependabot/maven/log4j2.version-2.23.1
add db725518e WW-5390 Fixes creating assembly and attaching sources when
preparing a new release
add 0f6d5dbb2 Merge pull request #903 from apache/fix/WW-5390-assembly
add e5e6145c3 Merge remote-tracking branch 'origin/master' into
merge/master-to-7xx-2024-04-07
add f59a06063 Merge pull request #904 from
apache/merge/master-to-7xx-2024-04-07
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 8 +-
README.md | 2 +-
.../showcase/fileupload/FileUploadAction.java | 5 +-
.../MultipleFileUploadUsingArrayAction.java | 82 ++++++-------
.../MultipleFileUploadUsingListAction.java | 88 +++++++-------
.../providers/XmlDocConfigurationProvider.java | 4 +-
.../apache/struts2/action/UploadedFilesAware.java | 3 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 13 ++-
.../multipart/AbstractMultiPartRequest.java | 11 +-
.../multipart/JakartaMultiPartRequest.java | 7 +-
.../multipart/JakartaStreamMultiPartRequest.java | 6 +-
.../dispatcher/multipart/MultiPartRequest.java | 2 +-
.../multipart/MultiPartRequestWrapper.java | 3 +-
.../dispatcher/multipart/StrutsUploadedFile.java | 4 +-
.../struts2/dispatcher/multipart/UploadedFile.java | 4 +-
.../interceptor/AbstractFileUploadInterceptor.java | 3 +-
.../interceptor/ActionFileUploadInterceptor.java | 7 +-
.../struts2/interceptor/ApplicationAware.java} | 18 ++-
.../struts2/interceptor/HttpParametersAware.java} | 18 ++-
.../struts2/interceptor/ParameterAware.java} | 27 ++---
.../struts2/interceptor/PrincipalAware.java} | 16 +--
.../RequestAware.java} | 31 +++--
.../struts2/interceptor/ServletRequestAware.java} | 18 ++-
.../struts2/interceptor/ServletResponseAware.java} | 18 ++-
.../apache/struts2/interceptor/SessionAware.java} | 18 ++-
.../{action => util}/ServletContextAware.java | 17 +--
.../multipart/AbstractMultiPartRequestTest.java | 8 +-
.../multipart/JakartaMultiPartRequestTest.java | 4 +-
.../ActionFileUploadInterceptorTest.java | 14 +--
.../interceptor/FileUploadInterceptorTest.java | 14 +--
plugins/jasperreports/pom.xml | 2 +-
.../portlet/interceptor/PortletContextAware.java} | 15 ++-
.../interceptor/PortletPreferencesAware.java | 20 ++--
.../portlet/interceptor/PortletRequestAware.java | 19 ++-
.../portlet/interceptor/PortletResponseAware.java | 19 ++-
plugins/tiles/pom.xml | 3 -
.../struts2/tiles/StrutsTilesContainerFactory.java | 28 +++--
.../tiles/StrutsTilesContainerFactoryTest.java | 128 +++++++++++++++++++++
pom.xml | 47 +++-----
39 files changed, 425 insertions(+), 329 deletions(-)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/ApplicationAware.java} (74%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/HttpParametersAware.java} (73%)
copy core/src/main/java/{com/opensymphony/xwork2/LocaleProviderFactory.java =>
org/apache/struts2/interceptor/ParameterAware.java} (65%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/PrincipalAware.java} (75%)
copy
core/src/main/java/org/apache/struts2/{views/freemarker/tags/DateModel.java =>
interceptor/RequestAware.java} (62%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/ServletRequestAware.java} (71%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/ServletResponseAware.java} (71%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/SessionAware.java} (76%)
copy core/src/main/java/org/apache/struts2/{action =>
util}/ServletContextAware.java (73%)
copy
plugins/{rest/src/main/java/org/apache/struts2/rest/handler/xstream/XStreamPermissionProvider.java
=>
portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java}
(72%)
copy
core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionRule.java
=>
plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java
(69%)
copy
core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java
=>
plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletRequestAware.java
(70%)
copy
core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java
=>
plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletResponseAware.java
(69%)
create mode 100644
plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java