You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/04/26 06:36:20 UTC
svn commit: r1740945 - in /sling/trunk/contrib/scripting/freemarker: pom.xml
src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java
Author: olli
Date: Tue Apr 26 04:36:20 2016
New Revision: 1740945
URL: http://svn.apache.org/viewvc?rev=1740945&view=rev
Log:
SLING-5691 Use UTF-8 as default encoding
Modified:
sling/trunk/contrib/scripting/freemarker/pom.xml
sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java
Modified: sling/trunk/contrib/scripting/freemarker/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/freemarker/pom.xml?rev=1740945&r1=1740944&r2=1740945&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/freemarker/pom.xml (original)
+++ sling/trunk/contrib/scripting/freemarker/pom.xml Tue Apr 26 04:36:20 2016
@@ -35,6 +35,12 @@
<name>Apache Sling Scripting FreeMarker</name>
<description>Support for FreeMarker scripting</description>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <sling.java.version>7</sling.java.version>
+ </properties>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/freemarker</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/freemarker</developerConnection>
Modified: sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java?rev=1740945&r1=1740944&r2=1740945&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java (original)
+++ sling/trunk/contrib/scripting/freemarker/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngine.java Tue Apr 26 04:36:20 2016
@@ -17,6 +17,7 @@
package org.apache.sling.scripting.freemarker.internal;
import java.io.Reader;
+import java.nio.charset.StandardCharsets;
import javax.script.Bindings;
import javax.script.ScriptContext;
@@ -52,6 +53,7 @@ public class FreemarkerScriptEngine exte
public FreemarkerScriptEngine(ScriptEngineFactory factory) {
super(factory);
configuration = new Configuration(version);
+ configuration.setDefaultEncoding(StandardCharsets.UTF_8.name());
beansWrapper = new BeansWrapper(version);
statics = beansWrapper.getStaticModels();
}