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 1406be18084706229b1461534529e306bfb5bbbc Merge: 2c481cd eedc075 Author: ddekany <[email protected]> AuthorDate: Mon Jun 15 02:19:25 2020 +0200 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 ivy.xml | 4 +- .../freemarker/ext/beans/ClassIntrospector.java | 65 ++--- .../java/freemarker/ext/beans/_MethodUtil.java | 82 ++++++ .../java/freemarker/template/Configuration.java | 3 + .../java/freemarker/template/_TemplateAPI.java | 1 + src/main/resources/freemarker/version.properties | 8 +- src/manual/en_US/book.xml | 285 +++++++++++++++++---- .../ext/beans/Java9InstrospectorBugWorkaround.java | 38 +++ .../java/freemarker/ext/beans/MethodUtilTest2.java | 164 ++++++++++++ .../freemarker/template/ConfigurationTest.java | 2 + .../template/DefaultObjectWrapperTest.java | 1 + 11 files changed, 567 insertions(+), 86 deletions(-)
