WW-5427 Upgrades Freemarker incompatible_improvements to version 2.3.33

apache · Oct 20, 2024 · b103b32 · b103b32
1 parent 954453b
commit b103b32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -353,7 +353,7 @@ protected Configuration createConfiguration(ServletContext servletContext) throw
     }
 
     protected Version getFreemarkerVersion(ServletContext servletContext) {
-        Version incompatibleImprovements = Configuration.VERSION_2_3_28;
+        Version incompatibleImprovements = Configuration.VERSION_2_3_33;
 
         String incompatibleImprovementsParam = servletContext.getInitParameter("freemarker." + Configuration.INCOMPATIBLE_IMPROVEMENTS_KEY_SNAKE_CASE);
         if (incompatibleImprovementsParam != null) {

diff --git a/core/src/test/java/org/apache/struts2/components/UIBeanTest.java b/core/src/test/java/org/apache/struts2/components/UIBeanTest.java
@@ -387,7 +387,7 @@ public void testNonceOfInvalidSession() {
         DoubleSelect dblSelect = new DoubleSelect(stack, req, res);
         dblSelect.evaluateParams();
 
-        assertNull(dblSelect.getParameters().get("nonce"));
+        assertNull(dblSelect.getAttributes().get("nonce"));
     }
 
     public void testSetNullUiStaticContentPath() {