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 7edcac886 Merge pull request #873 from apache/fix/WW-5388-fileupload
add e299bba11 Update maven-war-plugin to 3.4.0
add 8087ba97e Update maven-site-plugin to 3.12.1
add 028fedd30 Update assertj to 3.25.2
add 77285186d Update slf4j to 2.0.11
add 71d28ed90 Update jackson to 2.16.1
add f8a8172a3 Update spring to 5.3.31
add fd2cf9160 Update log4j2 to 2.21.1
add 8ef55db35 Update maven-dependency-plugin to 3.6.1
add 27f0b5696 Update maven-enforcer-plugin to 3.4.1
add fd7e74867 Update commons-lang3 to 3.14.0
add 218e634bf Update commons-io to 2.15.1
add abd824fdd Update commons-text to 1.11.0
add ce2467522 Merge pull request #863 from
sepe81/feature/dependency-updates
add 9328ae7ec WW-5391 Add interface for VelocityManager extension point
add ace6a713c WW-5391 Fix VelocityDecoratorServlet
add b5fca66ad WW-5391 Migrate other usages
add 93f0a5116 WW-5391 Fix bean definition
add 889a4180c WW-5391 Fix serialisation warnings
add 4aa1cbc56 Merge pull request #867 from
apache/WW-5391-velocity-ext-point
add e9eae281c Bump actions/upload-artifact from 4.3.0 to 4.3.1
add 42e8ad1cc Merge pull request #875 from
apache/dependabot/github_actions/actions/upload-artifact-4.3.1
add 07f0d1edd Bump commons-logging:commons-logging from 1.2 to 1.3.0
add 694b97cc3 Merge pull request #874 from
apache/dependabot/maven/commons-logging-commons-logging-1.3.0
add 6d6097c72 WW-5394 Use request encoding
add 0a2861b8a Merge pull request #872 from
aleksandr-m/feature/rest_encoding
add e3ca240b7 s:file shows server/file location WW-5396
add de9aacef6 s:file shows server/file location WW-5396
add 1c59b45a2 s:file shows server/file location WW-5396
add bb3edaec0 s:file shows server/file location WW-5396
add a84f85798 Merge pull request #876 from gregh3269/fix-for-WW-5396
add 45b06dd69 Merge remote-tracking branch 'origin/master' into
merge-master-to-7xx-2024-02-16
add c5d760ce5 Merge pull request #877 from
apache/merge-master-to-7xx-2024-02-16
No new revisions were added by this update.
Summary of changes:
.github/workflows/scorecards-analysis.yaml | 2 +-
.../java/org/apache/struts2/components/File.java | 6 +
core/src/site/resources/tags/file-attributes.html | 2 +-
.../struts2/config_browser/ShowBeansAction.java | 4 +-
.../struts2/views/java/simple/FileHandler.java | 1 -
.../apache/struts2/views/java/simple/FileTest.java | 3 +-
.../struts2/rest/ContentTypeInterceptor.java | 3 +-
.../struts2/rest/ContentTypeInterceptorTest.java | 154 ++++++++
.../OldDecorator2NewStrutsVelocityDecorator.java | 211 +++++------
.../struts2/sitemesh/VelocityDecoratorServlet.java | 390 +++++++++++----------
.../struts2/sitemesh/VelocityPageFilter.java | 22 +-
.../velocity/VelocityBeanSelectionProvider.java | 2 +-
.../struts2/views/velocity/VelocityManager.java | 5 +-
.../views/velocity/VelocityManagerInterface.java | 26 +-
.../views/velocity/result/VelocityResult.java | 37 +-
.../velocity/template/VelocityTemplateEngine.java | 17 +-
.../velocity/src/main/resources/struts-plugin.xml | 4 +
pom.xml | 22 +-
18 files changed, 565 insertions(+), 346 deletions(-)
create mode 100644
plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeInterceptorTest.java
copy
core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java =>
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManagerInterface.java
(70%)
