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 d146f340071f48f3672849cdf428334291ff5a37 Merge: f56dcdc2 3f2d6430 Author: ddekany <[email protected]> AuthorDate: Fri Aug 2 00:51:08 2024 +0200 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 build.gradle.kts | 5 +- .../freemarker/build/FreemarkerRootExtension.kt | 57 +++----- .../main/java/freemarker/core/Configurable.java | 159 ++++++++++++--------- .../src/main/java/freemarker/core/EvalUtil.java | 2 +- .../src/main/java/freemarker/core/_Java16.java | 9 ++ .../core/{_Java16.java => _Java16Impl.java} | 24 +++- .../src/main/java/freemarker/core/_Java9.java | 9 ++ .../core/{_Java16.java => _Java9Impl.java} | 22 +-- .../main/java/freemarker/core/_JavaVersions.java | 95 ------------ .../freemarker/ext/beans/ClassIntrospector.java | 9 +- .../ext/beans/ClassIntrospectorBuilder.java | 9 +- .../freemarker/core/ClassicCompatibleBugsTest.java | 59 -------- .../freemarker/core/ClassicCompatibleTest.java | 117 +++++++++++++++ .../src/main/java/freemarker/core/_Java16Impl.java | 13 +- .../beans/Java16TestClassLoadingCorrectTest.java | 42 ++++++ .../ext/beans/NotExportedInternalPackageTest.java | 3 + .../src/main/java/freemarker/core/_Java9Impl.java | 13 +- .../test/java/freemarker/core/Java9ImplTest.java | 10 +- .../core/Java9TestClassLoadingCorrectTest.java | 22 +-- 19 files changed, 365 insertions(+), 314 deletions(-)
