This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3 in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 82c6bc89d7f95dff311865e0c5d1bc30bb856c12 Merge: 4977a0b3 54667e0c Author: ddekany <[email protected]> AuthorDate: Sun Jun 22 17:12:38 2025 +0200 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 README.md | 16 +++++++++++++++- buildSrc/build.gradle.kts | 2 +- .../src/main/java/freemarker/core/CFormat.java | 3 ++- .../src/main/java/freemarker/log/Logger.java | 2 +- .../java/freemarker/template/Configuration.java | 3 +++ .../freemarker/version.properties | 8 ++++---- .../template/DefaultObjectWrapperTest.java | 1 + freemarker-manual/src/main/docgen/en_US/book.xml | 22 +++++++++++++--------- .../src/main/docgen/en_US/docgen.cjson | 10 ++++------ 9 files changed, 44 insertions(+), 23 deletions(-) diff --cc freemarker-core/src/main/resource-templates/freemarker/version.properties index 50a846fb,71f57e3f..8e35da00 --- a/freemarker-core/src/main/resource-templates/freemarker/version.properties +++ b/freemarker-core/src/main/resource-templates/freemarker/version.properties @@@ -90,7 -90,7 +90,7 @@@ versionForOSGi=2.3.35.nightl # "97 denotes "nightly", 98 denotes "pre", 99 denotes "rc" build. # In general, for the nightly/preview/rc Y of version 2.X, the versionForMf is # 2.X-1.(99|98).Y. Note the X-1. - versionForMf=2.3.34 + versionForMf=2.3.34.97 -isGAECompliant=true +isGAECompliant=false
