Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-05 14:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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 <noreply@anthropic.com>
This commit is contained in:
Lukasz Lenart
2026-07-21 11:32:34 +02:00
committed by GitHub
parent f5880be2ef
commit f32270cdb0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
+1 -1
View File
@@ -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) {
core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java
+1 -1
View File
@@ -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());
}