This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.scripting.thymeleaf-0.0.6 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-thymeleaf.git
commit d692342227543b5a7a92038e47155151a29fccb2 Author: Oliver Lietz <[email protected]> AuthorDate: Sat Jan 3 13:05:52 2015 +0000 SLING-4276 update Thymeleaf to 2.1.4 * update Thymeleaf * update dependencies (unbescape) * adjust AbstractHtmlTemplateParser git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/thymeleaf@1649199 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ++-- .../thymeleaf/templateparser/html/AbstractHtmlTemplateParser.java | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3e154f8..6930434 100644 --- a/pom.xml +++ b/pom.xml @@ -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> diff --git a/src/main/java/org/thymeleaf/templateparser/html/AbstractHtmlTemplateParser.java b/src/main/java/org/thymeleaf/templateparser/html/AbstractHtmlTemplateParser.java index b9a95ef..d4a4ddd 100755 --- a/src/main/java/org/thymeleaf/templateparser/html/AbstractHtmlTemplateParser.java +++ b/src/main/java/org/thymeleaf/templateparser/html/AbstractHtmlTemplateParser.java @@ -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 AbstractHtmlTemplateParser implements ITemplateParser { /** + * + * @return the result * @since 2.0.11 */ protected boolean shouldAddThymeleafRootToParser() { @@ -232,6 +234,9 @@ public abstract class AbstractHtmlTemplateParser implements ITemplateParser { /** + * + * @param reader reader + * @return the result * @since 2.0.11 */ protected TemplatePreprocessingReader getTemplatePreprocessingReader(final Reader reader) { -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
