WW-5580 Use Configuration.VERSION_2_3_34 for FreeMarker config#1798
Merged
lukaszlenart merged 1 commit intoJul 21, 2026
Merged
Conversation
…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 <noreply@anthropic.com>
lukaszlenart
enabled auto-merge (squash)
July 21, 2026 09:16
lukaszlenart
deleted the
WW-5580-freemarker-2-3-34-incompatible-improvements
branch
July 21, 2026 09:32
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Aligns FreeMarker's
incompatible_improvementssetting inFreemarkerManagerwith the FreeMarker 2.3.34 dependency already declared in the build (it was still pinned toVERSION_2_3_33).Risk
None at runtime. FreeMarker 2.3.34 declares
Configuration.VERSION_2_3_34as an incompatible-improvements break-point, but nothing in 2.3.34 gates behaviour on it:_VersionIntsdefinesV_2_3_33but noV_2_3_34BeansWrapper,ClassIntrospectorBuilder) cap at 2.3.33setIncompatibleImprovementsjavadoc change list stops at 2.3.33So this is purely keeping the setting in sync with the dependency.
Tests
testIncompatibleImprovementsByOverridingintentionally stays onVERSION_2_3_33— it now asserts a value that differs from the default, so it actually exercises the override path (previously it matched the default and passed trivially).All 26 tests in
org.apache.struts2.views.freemarker.**pass, including the template rendering/auto-escaping test.Fixes WW-5580
🤖 Generated with Claude Code