(freemarker) 01/01: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

[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 8a8d832193c66fc72e6a6bba680f24e029355c9a
Merge: 777d94f1 19e99c6a
Author: ddekany <dd...@apache.org>
AuthorDate: Sun Dec 1 01:54:59 2024 +0100

    Merge remote-tracking branch 'origin/2.3-gae' into 2.3

 .github/workflows/ci.yml                           | 10 ++--
 .../core/BuiltInsForExistenceHandling.java         |  2 +-
 .../freemarker/template/utility/StringUtil.java    |  5 ++
 .../src/main/javacc/freemarker/core/FTL.jj         | 12 ++--
 .../freemarker/version.properties                  |  8 +--
 .../java/freemarker/core/SepParsingBugTest.java    | 65 ++++++++++++++++++++++
 .../java/freemarker/core/StringBuiltInTest.java    |  9 +++
 freemarker-manual/src/main/docgen/en_US/book.xml   | 54 ++++++++++++------
 8 files changed, 130 insertions(+), 35 deletions(-)

diff --cc freemarker-core/src/main/resource-templates/freemarker/version.properties
index 4a4d91e6,9e23f08e..50a846fb
--- 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.34.stabl
  # "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.33.97
+ versionForMf=2.3.34
  
  
 -isGAECompliant=true
 +isGAECompliant=false