(struts) branch main updated: WW-5580 chore(core): use Configuration.VERSION_2_3_34 for FreeMarker config (#1798)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/main by this push:
     new f32270cdb WW-5580 chore(core): use Configuration.VERSION_2_3_34 for 
FreeMarker config (#1798)
f32270cdb is described below

commit f32270cdb0d3fcbe1aafaa30608865afb9639d24
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Tue Jul 21 11:32:34 2026 +0200

    WW-5580 chore(core): use Configuration.VERSION_2_3_34 for FreeMarker config 
(#1798)
    
    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 <nore...@anthropic.com>
---
 .../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&#39;s an 
error message')\"/>", out.toString());
     }