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 ad17096cdb46d5323c9f972c31314f4b51d63568 Merge: db747fb0 8a227856 Author: ddekany <[email protected]> AuthorDate: Wed May 8 23:43:03 2024 +0200 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 README.md | 120 ++++++++++----------- .../java/freemarker/core/DotBeforeMethodCall.java | 4 +- .../freemarker/core/TemplateProcessingTracer.java | 11 +- .../java/freemarker/ext/beans/BeansWrapper.java | 34 +++--- .../ext/beans/BeansWrapperConfiguration.java | 9 ++ .../freemarker/ext/beans/ClassIntrospector.java | 4 +- .../ext/beans/ClassIntrospectorBuilder.java | 24 ++++- .../freemarker/ext/beans/MemberAccessPolicy.java | 7 +- .../ext/beans/MethodAppearanceFineTuner.java | 61 +++++------ .../ext/beans/ZeroArgumentNonVoidMethodPolicy.java | 36 +++++-- .../template/MethodCallAwareTemplateHashModel.java | 47 +++++--- .../freemarker/version.properties | 8 +- .../beans/TestZeroArgumentNonVoidMethodPolicy.java | 18 ++-- freemarker-manual/src/main/docgen/en_US/book.xml | 25 +++-- 14 files changed, 237 insertions(+), 171 deletions(-) diff --cc freemarker-core/src/main/resource-templates/freemarker/version.properties index 742177d7,aa63fee6..580c2eb3 --- 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.33.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.32.97 + versionForMf=2.3.33 -isGAECompliant=true +isGAECompliant=false
