[freemarker-online-tester] branch master updated (e0d7636 -> 97e1b3d)

[dd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/freemarker-online-tester.git.


    from e0d7636  Use SimpleObjectWrapper (a subclass of it with XML support actually), instead of DefaultObjectWrapper, to be on the safe side.
     new 672977d  Avoid ERROR log for using dynamic current version (logged since 2.3.30)
     new 97e1b3d  Updated to FreeMarker 2.3.30

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 dependencies.gradle                                                  | 2 +-
 .../apache/freemarker/onlinetester/services/FreeMarkerService.java   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

[freemarker-online-tester] 02/02: Updated to FreeMarker 2.3.30

[dd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/freemarker-online-tester.git

commit 97e1b3dabc6fa082d0315fda834c5d25d9bd5fb6
Author: ddekany <dd...@apache.org>
AuthorDate: Sat Mar 7 15:53:56 2020 +0100

    Updated to FreeMarker 2.3.30
---
 dependencies.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index fe3e680..6b4f56b 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -31,7 +31,7 @@ ext.libraries = [
         dropwizard_bundles_redirect: "io.dropwizard-bundles:dropwizard-redirect-bundle:1.2.2",
 
         // App. specific:
-        freemarker: "org.freemarker:freemarker:2.3.29",
+        freemarker: "org.freemarker:freemarker:2.3.30",
         jersey_core: "org.glassfish.jersey.core:jersey-core:$jersey_version",
 
         // Commons:

[freemarker-online-tester] 01/02: Avoid ERROR log for using dynamic current version (logged since 2.3.30)

[dd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/freemarker-online-tester.git

commit 672977dccd483ba5c9af38cd86a0396db7836aef
Author: ddekany <dd...@apache.org>
AuthorDate: Sun Feb 16 15:38:17 2020 +0100

    Avoid ERROR log for using dynamic current version (logged since 2.3.30)
---
 .../apache/freemarker/onlinetester/services/FreeMarkerService.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/freemarker/onlinetester/services/FreeMarkerService.java b/src/main/java/org/apache/freemarker/onlinetester/services/FreeMarkerService.java
index 9331761..1554121 100644
--- a/src/main/java/org/apache/freemarker/onlinetester/services/FreeMarkerService.java
+++ b/src/main/java/org/apache/freemarker/onlinetester/services/FreeMarkerService.java
@@ -48,7 +48,6 @@ import freemarker.core.TemplateClassResolver;
 import freemarker.core.TemplateConfiguration;
 import freemarker.template.AttemptExceptionReporter;
 import freemarker.template.Configuration;
-import freemarker.template.SimpleObjectWrapper;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
 import freemarker.template.TemplateExceptionHandler;
@@ -100,7 +99,9 @@ public class FreeMarkerService {
         threadPoolExecutor.allowCoreThreadTimeOut(true);
         templateExecutor = threadPoolExecutor;
 
-        Version latestVersion = Configuration.getVersion();
+        // Avoid ERROR log for using the actual current version. This application is special in that regard.
+        Version latestVersion = new Version(Configuration.getVersion().toString());
+
         freeMarkerConfig = new Configuration(latestVersion);
         freeMarkerConfig.setNewBuiltinClassResolver(TemplateClassResolver.ALLOWS_NOTHING_RESOLVER);
         freeMarkerConfig.setObjectWrapper(new SimpleObjectWrapperWithXmlSupport(latestVersion));