(freemarker) 01/01: Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35

[ddekany]

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 cbe33e063012548a39a3ed3c0122412ebd1cf667
Merge: fc7fd5fc 423bc695
Author: ddekany <ddek...@apache.org>
AuthorDate: Tue Jan 23 10:38:12 2024 +0100

    Merge remote-tracking branch 'origin/2.3-gae' into FREEMARKER-35
    
    # Conflicts:
    #       freemarker-core/src/main/java/freemarker/template/Configuration.java

 .github/workflows/ci.yml                           |   8 +-
 README.md                                          |  13 +-
 build.gradle.kts                                   | 156 +++++++++++-
 .../freemarker/build/FreemarkerRootExtension.kt    | 122 +++++++--
 .../freemarker/build/FreemarkerRootPlugin.kt       |  14 +-
 .../build/JakartaSourceRootGeneratorTask.kt        | 277 +++++++++++++++++++++
 .../java/freemarker/cache/TemplateLoaderUtils.java |   2 +-
 .../java/freemarker/cache/URLTemplateSource.java   |  10 +-
 .../src/main/java/freemarker/core/EvalUtil.java    |   2 +-
 .../freemarker/core/InvalidReferenceException.java |   4 +-
 .../src/main/java/freemarker/core/MethodCall.java  |   2 +-
 .../java/freemarker/core/NonMethodException.java   |   4 +
 .../main/java/freemarker/ext/beans/BeanModel.java  |  19 +-
 .../ext/beans/MethodAppearanceFineTuner.java       |  23 +-
 .../java/freemarker/template/Configuration.java    |  28 +--
 .../freemarker/template/TemplateHashModel.java     |   9 +-
 .../src/main/java/freemarker/template/Version.java |   3 +
 .../freemarker/version.properties                  |  19 +-
 .../freemarker/cache/WebappTemplateLoader.java     |   9 +-
 .../java/freemarker/ext/jsp/EventForwarding.java   |   3 +
 .../ext/jsp/FreeMarkerJspApplicationContext.java   |   2 -
 .../java/freemarker/ext/jsp/TaglibFactory.java     |   3 +
 .../src/main/java/freemarker/ext/jsp/package.html  |   4 +
 .../ext/servlet/AllHttpScopesHashModel.java        |   3 +
 .../freemarker/ext/servlet/FreemarkerServlet.java  |   6 +-
 .../ext/servlet/HttpRequestHashModel.java          |   3 +
 .../servlet/HttpRequestParametersHashModel.java    |   4 +-
 .../ext/servlet/HttpSessionHashModel.java          |   4 +-
 .../java/freemarker/ext/servlet/IncludePage.java   |   3 +
 .../ext/servlet/ServletContextHashModel.java       |   3 +
 .../main/java/freemarker/ext/servlet/package.html  |   4 +
 .../freemarker/template/MockServletContext.java    |  46 +++-
 .../freemarker/test/servlet/WebAppTestCase.java    |   2 +-
 .../tldDiscovery/WEB-INF/expected/test1.txt        |   2 +-
 freemarker-manual/src/main/docgen/en_US/book.xml   |  68 ++++-
 .../main}/java/freemarker/test/TemplateTest.java   |   0
 gradle.properties                                  |   3 +
 osgi.bnd                                           |   5 +
 rat-excludes                                       |   1 +
 settings.gradle.kts                                |   4 +
 40 files changed, 769 insertions(+), 128 deletions(-)

diff --cc freemarker-core/src/main/java/freemarker/template/Configuration.java
index daf17490,97a22cb3..7106f4f8
--- a/freemarker-core/src/main/java/freemarker/template/Configuration.java
+++ b/freemarker-core/src/main/java/freemarker/template/Configuration.java
@@@ -26,11 -26,8 +26,9 @@@ import java.lang.reflect.InvocationTarg
  import java.net.URLConnection;
  import java.text.Collator;
  import java.text.DecimalFormat;
- import java.text.SimpleDateFormat;
 +import java.time.temporal.Temporal;
  import java.util.Collection;
  import java.util.Collections;
- import java.util.Date;
  import java.util.HashMap;
  import java.util.HashSet;
  import java.util.Iterator;
@@@ -519,23 -512,10 +517,10 @@@ public class Configuration extends Conf
              Properties props = ClassUtil.loadProperties(Configuration.class, 
VERSION_PROPERTIES_PATH);
              
              String versionString  = getRequiredVersionProperty(props, 
"version");
-             
-             Date buildDate;
-             {
-                 String buildDateStr = getRequiredVersionProperty(props, 
"buildTimestamp");
-                 if (buildDateStr.endsWith("Z")) {
-                     buildDateStr = buildDateStr.substring(0, 
buildDateStr.length() - 1) + "+0000";
-                 }
-                 try {
-                     buildDate = new 
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US).parse(buildDateStr);
-                 } catch (java.text.ParseException e) {
-                     buildDate = null;
-                 }
-             }
--            
++
              final Boolean gaeCompliant = 
Boolean.valueOf(getRequiredVersionProperty(props, "isGAECompliant"));
              
-             VERSION = new Version(versionString, gaeCompliant, buildDate);
+             VERSION = new Version(versionString, gaeCompliant, null);
          } catch (IOException e) {
              throw new RuntimeException("Failed to load and parse " + 
VERSION_PROPERTIES_PATH, e);
          }