[engine] fix compilation and tests after last commits

git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1783729 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 2 insertions, 3 deletions

diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/ExtProperties.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/ExtProperties.java
index 3f5b3246..30112a35 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/util/ExtProperties.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/ExtProperties.java
@@ -26,6 +26,7 @@ import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.security.AccessController;
 import java.util.ArrayList;
 import java.util.Enumeration;
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java
index ce407fb9..60847b5a 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java
@@ -23,8 +23,6 @@ import org.apache.velocity.runtime.directive.Directive;
 import org.apache.velocity.runtime.parser.node.Node;
 import org.apache.velocity.util.introspection.Info;
 
-import org.apache.commons.lang3.StringUtils;
-
 /**
  * This class provides some methods for dynamically
  * invoking methods in objects, and some string
@@ -77,7 +75,7 @@ public class StringUtils
     public static String formatFileString(String template, int linenum, int colnum)
     {
         StringBuilder buffer = new StringBuilder();
-        if (StringUtils.isEmpty(template))
+        if (org.apache.commons.lang3.StringUtils.isEmpty(template))
         {
             template = "<unknown template>";
         }