You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2026/09/05 13:45:19 UTC
(freemarker) branch 2.3 updated (fab84a61 -> ffce4e71)
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch 2.3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
from fab84a61 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
add bea5c357 Updated version number to 2.3.36-SNAPSHOT
add e156e5fa Added Configuration.VERSION_2_3_36, and fixed DefaultObjectWrapperTest (and changed it to be more understandable)
new ffce4e71 Merge remote-tracking branch 'origin/2.3-gae' into 2.3
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/freemarker/template/Configuration.java | 84 +++++++++++++++--
.../freemarker/version.properties | 14 +--
.../template/DefaultObjectWrapperTest.java | 103 +++++++++++++--------
3 files changed, 145 insertions(+), 56 deletions(-)
(freemarker) 01/01: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Posted by dd...@apache.org.
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 ffce4e7186f42a438dd90b2206c679b4c7020c9a
Merge: fab84a61 e156e5fa
Author: ddekany <dd...@apache.org>
AuthorDate: Sat Sep 5 15:45:01 2026 +0200
Merge remote-tracking branch 'origin/2.3-gae' into 2.3
.../java/freemarker/template/Configuration.java | 84 +++++++++++++++--
.../freemarker/version.properties | 14 +--
.../template/DefaultObjectWrapperTest.java | 103 +++++++++++++--------
3 files changed, 145 insertions(+), 56 deletions(-)
diff --cc freemarker-core/src/main/resource-templates/freemarker/version.properties
index 285abbe3,22a45cce..b07480a9
--- a/freemarker-core/src/main/resource-templates/freemarker/version.properties
+++ b/freemarker-core/src/main/resource-templates/freemarker/version.properties
@@@ -88,9 -89,8 +89,8 @@@ versionForOSGi=2.3.36.nightl
# 3.0.0.pre2 -> 2.98.2
#
# "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.35
+ # The idea is that MF versions can be sorted by value like that, e.g. for 2.3.27 Nightly, 2.3.26.97 < 2.3.27
+ versionForMf=2.3.35.97
-isGAECompliant=true
+isGAECompliant=false