This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch FREEMARKER-35 in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit d1097c2432903a7a7c29a361819f08b1425e4fb9 Merge: 5a766442 35e1664e Author: ddekany <[email protected]> AuthorDate: Fri Dec 8 22:55:56 2023 +0100 Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35 # Conflicts: # build.properties.sample # build.xml # src/main/java/freemarker/core/UnformattableTemporalTypeException.java # src/main/java/freemarker/template/SimpleTemporal.java .github/workflows/ci.yml | 7 ------- README.md | 2 +- build.properties.sample | 1 - build.xml | 14 +++++++------- osgi.bnd | 8 ++++---- src/manual/en_US/book.xml | 3 +++ 6 files changed, 15 insertions(+), 20 deletions(-) diff --cc build.xml index 22db00b5,8dc70332..375c1033 --- a/build.xml +++ b/build.xml @@@ -252,7 -253,7 +252,7 @@@ debug="on" optimize="off" target="1.8" source="1.8" encoding="utf-8" includeantruntime="false" classpathref="ivy.dep.jsp2.0" -- bootclasspath="${boot.classpath.j2se1.8}" ++ bootclasspath="${boot.classpath.j2se1.7}" includes=" freemarker/ext/jsp/**, freemarker/ext/servlet/**,
