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 dda472589d9ca63f1fd39b24bf8e5c2d531d0399 Merge: 46c927cd cb654936 Author: ddekany <[email protected]> AuthorDate: Tue Jun 4 00:23:02 2024 +0200 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 README.md | 2 +- build.gradle.kts | 4 +- buildSrc/build.gradle.kts | 7 ++- .../freemarker/build/FreemarkerRootExtension.kt | 65 +++++++++++++++++++--- .../freemarker/build/FreemarkerRootPlugin.kt | 10 +++- .../freemarker/version.properties | 8 +-- freemarker-manual/src/main/docgen/en_US/book.xml | 8 +-- 7 files changed, 83 insertions(+), 21 deletions(-) diff --cc freemarker-core/src/main/resource-templates/freemarker/version.properties index 580c2eb3,a8776c9b..d70495e6 --- a/freemarker-core/src/main/resource-templates/freemarker/version.properties +++ b/freemarker-core/src/main/resource-templates/freemarker/version.properties @@@ -92,7 -92,7 +92,7 @@@ versionForOSGi=2.3.34.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.33 + versionForMf=2.3.33.97 -isGAECompliant=true +isGAECompliant=false
