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 f3629d9a3e231b3ce566780c6710029b5ae8eef3 Merge: f95cf9c f13ef35 Author: ddekany <[email protected]> AuthorDate: Tue Jan 14 23:24:16 2020 +0100 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 README.md | 8 +- build.properties.sample | 3 +- build.xml | 68 ++---- .../core/ExtendedDecimalFormatParser.java | 17 +- src/main/java/freemarker/core/_Java6.java | 35 --- src/main/java/freemarker/core/_Java6Impl.java | 47 ---- src/main/java/freemarker/core/_JavaVersions.java | 43 ---- .../ext/beans/AllowAllMemberAccessPolicy.java | 58 +++++ .../ext/beans/BlacklistMemberAccessPolicy.java | 18 ++ .../freemarker/ext/beans/ClassIntrospector.java | 80 ++++--- .../ext/beans/DefaultMemberAccessPolicy.java | 37 +++- .../ext/beans/LegacyDefaultMemberAccessPolicy.java | 5 + .../freemarker/ext/beans/MemberAccessPolicy.java | 10 + .../MemberSelectorListMemberAccessPolicy.java | 120 +++------- .../java/freemarker/ext/beans/StaticModel.java | 11 +- .../java/freemarker/ext/beans/StringModel.java | 9 +- .../ext/beans/WhitelistMemberAccessPolicy.java | 18 ++ src/manual/en_US/book.xml | 27 ++- .../ext/beans/DefaultMemberAccessPolicyTest.java | 6 + ...DefaultObjectWrapperMemberAccessPolicyTest.java | 241 +++++++++++++++++++++ ... MemberSelectorListMemberAccessPolicyTest.java} | 71 +++++- .../freemarker/template/ConfigurationTest.java | 11 +- .../template/DefaultObjectWrapperTest.java | 2 +- 23 files changed, 598 insertions(+), 347 deletions(-)
