#327 Update Freemarker

javalite · Feb 13, 2017 · ec8aabc · ec8aabc
1 parent fdc3f3d
commit ec8aabc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/activeweb/src/test/java/org/javalite/activeweb/RequestDispatcherSpec.java b/activeweb/src/test/java/org/javalite/activeweb/RequestDispatcherSpec.java
@@ -228,13 +228,10 @@ public void shouldSend404IfTemplateIsMissing() throws ServletException, IOExcept
 
         dispatcher.doFilter(request, response, filterChain);
 
-        System.out.println(getSystemErr());
-        a(getSystemErr().contains("Template \"/hello/no-view.ftl\" not found.")).shouldBeTrue();
-
+        a(getSystemErr().contains("Template not found for name \"/hello/no-view.ftl")).shouldBeTrue();
         String html = response.getContentAsString();
-
         a(XPathHelper.count("//div", html)).shouldBeEqual(3);
-        a(XPathHelper.selectText("//div[@id='content']", html)).shouldBeEqual("Failed to render template: 'src/test/views/hello/no-view.ftl', with layout: 'src/test/views/layouts/default_layout'; Template \"/hello/no-view.ftl\" not found.");
+        a(XPathHelper.selectText("//div[@id='content']", html)).shouldContain("Failed to render template: 'src/test/views/hello/no-view.ftl', with layout: 'src/test/views/layouts/default_layout'; Template not found for name \"/hello/no-view.ftl\"");
     }
 
     @Test

diff --git a/pom.xml b/pom.xml
@@ -131,7 +131,7 @@
             <dependency>
                 <groupId>org.freemarker</groupId>
                 <artifactId>freemarker</artifactId>
-                <version>2.3.20</version>
+                <version>2.3.25-incubating</version>
             </dependency>
             <dependency>
                 <groupId>dom4j</groupId>