(struts) branch dependabot/maven/log4j2.version-2.22.1 updated (a33534a8d -> 38a7271b6)
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%)
(struts) branch dependabot/maven/log4j2.version-2.22.1 deleted (was 38a7271b6)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/log4j2.version-2.22.1 in repository https://gitbox.apache.org/repos/asf/struts.git was 38a7271b6 Bump log4j2.version from 2.20.0 to 2.22.1 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) 01/01: Ignores JakartaEE modules to allow run test in IDE
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch example/ignore-jakarta-modules
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 780b3cae16b7d538263e2578df78ba531373cd2a
Author: Lukasz Lenart
AuthorDate: Mon Feb 5 20:46:57 2024 +0100
Ignores JakartaEE modules to allow run test in IDE
---
pom.xml | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8323bc657..6a64eba9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
bom
-jakarta
+
core
plugins
apps
@@ -530,7 +530,7 @@
org.apache.struts
struts2-freemarker-jakarta
-${project.version}
+7.0.0-M3-SNAPSHOT
org.apache.struts
@@ -676,13 +676,19 @@
org.apache.struts
struts2-velocity-tools-view-jakarta
-${project.version}
+7.0.0-M3-SNAPSHOT
org.apache.struts
struts2-velocity-tools-jsp-jakarta
-${project.version}
+7.0.0-M3-SNAPSHOT
+
+
+
+org.apache.struts
+struts2-sitemesh2-jakarta
+7.0.0-M3-SNAPSHOT
(struts) branch example/ignore-jakarta-modules created (now 780b3cae1)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch example/ignore-jakarta-modules in repository https://gitbox.apache.org/repos/asf/struts.git at 780b3cae1 Ignores JakartaEE modules to allow run test in IDE This branch includes the following new commits: new 780b3cae1 Ignores JakartaEE modules to allow run test in IDE The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
