You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/11/07 21:27:22 UTC
[1/2] incubator-freemarker-online-tester git commit: Updated to
FreeMarker 2.3.27
Repository: incubator-freemarker-online-tester
Updated Branches:
refs/heads/master 945fce867 -> c2c5072f7
Updated to FreeMarker 2.3.27
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/commit/5c529cbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/tree/5c529cbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/diff/5c529cbf
Branch: refs/heads/master
Commit: 5c529cbfb4ce19f8df0117421acdaae8e7e8efbd
Parents: 945fce8
Author: ddekany <dd...@apache.org>
Authored: Tue Nov 7 22:26:43 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Tue Nov 7 22:26:43 2017 +0100
----------------------------------------------------------------------
dependencies.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/5c529cbf/dependencies.gradle
----------------------------------------------------------------------
diff --git a/dependencies.gradle b/dependencies.gradle
index 9e2f318..abfc7d2 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -30,7 +30,7 @@ ext.libraries = [
dropwizard_bundles_redirect: "io.dropwizard-bundles:dropwizard-redirect-bundle:1.0.5",
// App. specific:
- freemarker: "org.freemarker:freemarker:2.3.26-incubating",
+ freemarker: "org.freemarker:freemarker:2.3.27-incubating",
jersey_core: "org.glassfish.jersey.core:jersey-core:$jeresy_version",
jackson_databind: "com.fasterxml.jackson.core:jackson-databind:$jackson_version",
[2/2] incubator-freemarker-online-tester git commit: Don't pollute
error log with #recover reports.
Posted by dd...@apache.org.
Don't pollute error log with #recover reports.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/commit/c2c5072f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/tree/c2c5072f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/diff/c2c5072f
Branch: refs/heads/master
Commit: c2c5072f70470a35a183b0c05310404b1ed058ec
Parents: 5c529cb
Author: ddekany <dd...@apache.org>
Authored: Tue Nov 7 22:27:11 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Tue Nov 7 22:27:11 2017 +0100
----------------------------------------------------------------------
.../freemarker/onlinetester/services/FreeMarkerService.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/c2c5072f/src/main/java/org/apache/freemarker/onlinetester/services/FreeMarkerService.java
----------------------------------------------------------------------
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 c1efce4..ede3aa0 100644
--- a/src/main/java/org/apache/freemarker/onlinetester/services/FreeMarkerService.java
+++ b/src/main/java/org/apache/freemarker/onlinetester/services/FreeMarkerService.java
@@ -41,11 +41,13 @@ import org.eclipse.jetty.util.BlockingArrayQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import freemarker.core.Environment;
import freemarker.core.FreeMarkerInternalsAccessor;
import freemarker.core.OutputFormat;
import freemarker.core.ParseException;
import freemarker.core.TemplateClassResolver;
import freemarker.core.TemplateConfiguration;
+import freemarker.template.AttemptExceptionReporter;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
@@ -99,6 +101,12 @@ public class FreeMarkerService {
freeMarkerConfig.setNewBuiltinClassResolver(TemplateClassResolver.ALLOWS_NOTHING_RESOLVER);
freeMarkerConfig.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
freeMarkerConfig.setLogTemplateExceptions(false);
+ freeMarkerConfig.setAttemptExceptionReporter(new AttemptExceptionReporter() {
+ @Override
+ public void report(TemplateException te, Environment env) {
+ // Suppress it
+ }
+ });
freeMarkerConfig.setLocale(AllowedSettingValuesMaps.DEFAULT_LOCALE);
freeMarkerConfig.setTimeZone(AllowedSettingValuesMaps.DEFAULT_TIME_ZONE);
freeMarkerConfig.setOutputFormat(AllowedSettingValuesMaps.DEFAULT_OUTPUT_FORMAT);