This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch dependabot/maven/log4j2.version-2.22.1
in repository https://gitbox.apache.org/repos/asf/struts.git
discard a33534a8d Bump log4j2.version from 2.20.0 to 2.22.1
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 38a7271b6 Bump log4j2.version from 2.20.0 to 2.22.1
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a33534a8d)
\
N -- N -- N refs/heads/dependabot/maven/log4j2.version-2.22.1
(38a7271b6)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../struts2/config_browser/ShowBeansAction.java | 4 +-
.../struts2/osgi/OsgiConfigurationProvider.java | 24 +-
.../portlet/result/PortletVelocityResult.java | 564 +++++++++++----------
.../OldDecorator2NewStrutsVelocityDecorator.java | 211 ++++----
.../struts2/sitemesh/VelocityDecoratorServlet.java | 389 +++++++-------
.../struts2/sitemesh/VelocityPageFilter.java | 24 +-
.../velocity/VelocityBeanSelectionProvider.java | 2 +-
.../struts2/views/velocity/VelocityManager.java | 5 +-
.../views/velocity/VelocityManagerInterface.java | 25 +-
.../views/velocity/result/VelocityResult.java | 37 +-
.../velocity/template/VelocityTemplateEngine.java | 17 +-
.../velocity/src/main/resources/struts-plugin.xml | 4 +
12 files changed, 699 insertions(+), 607 deletions(-)
copy core/src/main/java/org/apache/struts2/views/freemarker/tags/IfModel.java
=>
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManagerInterface.java
(70%)
