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 2015/01/03 14:05:52 UTC
svn commit: r1649199 - in /sling/trunk/contrib/scripting/thymeleaf: pom.xml
src/main/java/org/thymeleaf/templateparser/html/AbstractHtmlTemplateParser.java
Author: olli
Date: Sat Jan 3 13:05:52 2015
New Revision: 1649199
URL: http://svn.apache.org/r1649199
Log:
SLING-4276 update Thymeleaf to 2.1.4
* update Thymeleaf
* update dependencies (unbescape)
* adjust AbstractHtmlTemplateParser
Modified:
sling/trunk/contrib/scripting/thymeleaf/pom.xml
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/thymeleaf/templateparser/html/AbstractHtmlTemplateParser.java
Modified: sling/trunk/contrib/scripting/thymeleaf/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/pom.xml?rev=1649199&r1=1649198&r2=1649199&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/pom.xml (original)
+++ sling/trunk/contrib/scripting/thymeleaf/pom.xml Sat Jan 3 13:05:52 2015
@@ -114,13 +114,13 @@
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
- <version>2.1.3.RELEASE</version>
+ <version>2.1.4.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.unbescape</groupId>
<artifactId>unbescape</artifactId>
- <version>1.0</version>
+ <version>1.1.0.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/thymeleaf/templateparser/html/AbstractHtmlTemplateParser.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/thymeleaf/templateparser/html/AbstractHtmlTemplateParser.java?rev=1649199&r1=1649198&r2=1649199&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/thymeleaf/templateparser/html/AbstractHtmlTemplateParser.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/thymeleaf/templateparser/html/AbstractHtmlTemplateParser.java Sat Jan 3 13:05:52 2015
@@ -1,7 +1,7 @@
/*
* =============================================================================
*
- * Copyright (c) 2011-2013, The THYMELEAF team (http://www.thymeleaf.org)
+ * Copyright (c) 2011-2014, The THYMELEAF team (http://www.thymeleaf.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -223,6 +223,8 @@ public abstract class AbstractHtmlTempla
/**
+ *
+ * @return the result
* @since 2.0.11
*/
protected boolean shouldAddThymeleafRootToParser() {
@@ -232,6 +234,9 @@ public abstract class AbstractHtmlTempla
/**
+ *
+ * @param reader reader
+ * @return the result
* @since 2.0.11
*/
protected TemplatePreprocessingReader getTemplatePreprocessingReader(final Reader reader) {