You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2024/10/20 09:19:22 UTC
(struts) 01/01: WW-5427 Upgrades Freemarker incompatible_improvements to version 2.3.33
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5427-incompatible-improvements
in repository https://gitbox.apache.org/repos/asf/struts.git
commit b103b3294143b596a0a2766c2711c15e534ca336
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Sun Oct 20 11:19:08 2024 +0200
WW-5427 Upgrades Freemarker incompatible_improvements to version 2.3.33
---
.../java/org/apache/struts2/views/freemarker/FreemarkerManager.java | 2 +-
core/src/test/java/org/apache/struts2/components/UIBeanTest.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 6f0594769..d3a90d4f2 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
@@ -353,7 +353,7 @@ public class FreemarkerManager {
}
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
index dfacfeea3..680fb115d 100644
--- 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 class UIBeanTest extends StrutsInternalTestCase {
DoubleSelect dblSelect = new DoubleSelect(stack, req, res);
dblSelect.evaluateParams();
- assertNull(dblSelect.getParameters().get("nonce"));
+ assertNull(dblSelect.getAttributes().get("nonce"));
}
public void testSetNullUiStaticContentPath() {