This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch WW-5580-freemarker-2-3-34-incompatible-improvements in repository https://gitbox.apache.org/repos/asf/struts.git
commit 40342f5363c37c3949d1fdf45b154305afdea89d Author: Lukasz Lenart <[email protected]> AuthorDate: Tue Jul 21 11:16:21 2026 +0200 WW-5580 chore(core): use Configuration.VERSION_2_3_34 for FreeMarker config Aligns the FreeMarker incompatible_improvements setting with the FreeMarker 2.3.34 dependency already declared in the build. FreeMarker 2.3.34 declares VERSION_2_3_34 as an incompatible improvements break-point but does not gate any behaviour on it, so this is a no-op at runtime and purely keeps the setting in sync with the dependency. Co-Authored-By: Claude Opus 4.8 <[email protected]> --- .../java/org/apache/struts2/views/freemarker/FreemarkerManager.java | 2 +- .../java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java index e6432d337..3824a43c6 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java @@ -358,7 +358,7 @@ public class FreemarkerManager { } protected Version getFreemarkerVersion(ServletContext servletContext) { - Version incompatibleImprovements = Configuration.VERSION_2_3_33; + Version incompatibleImprovements = Configuration.VERSION_2_3_34; String incompatibleImprovementsParam = servletContext.getInitParameter("freemarker." + Configuration.INCOMPATIBLE_IMPROVEMENTS_KEY_SNAKE_CASE); if (incompatibleImprovementsParam != null) { diff --git a/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java index 8abfafc19..834983fca 100644 --- a/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java +++ b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java @@ -97,7 +97,7 @@ public class FreemarkerManagerTest extends StrutsInternalTestCase { tpl.process(model, out); // then - assertEquals(Configuration.VERSION_2_3_33, configuration.getIncompatibleImprovements()); + assertEquals(Configuration.VERSION_2_3_34, configuration.getIncompatibleImprovements()); assertEquals("<input type=\"text\" onclick=\"this.alert('It's an error message')\"/>", out.toString()); }
