This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.scripting.thymeleaf-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-thymeleaf.git
commit eec00190cc071e3abdd9a96def8f94d4cc2c8e78 Author: Oliver Lietz <[email protected]> AuthorDate: Thu May 12 13:09:16 2016 +0000 SLING-5075 Upgrade Thymeleaf to 3.0 * update to Thymeleaf 3.0.0.RELEASE, AttoParser 2.0.0.RELEASE and OGNL 3.1.3 * add dependency javassist for completeness git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf@1743496 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 12 +++++++++--- src/main/java/org/thymeleaf/engine/TemplateManager.java | 8 ++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index b32f66f..dfa1108 100644 --- a/pom.xml +++ b/pom.xml @@ -39,10 +39,10 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <sling.java.version>7</sling.java.version> - <org.thymeleaf.version>3.0.0.BETA03</org.thymeleaf.version> - <org.attoparser.version>2.0.0.BETA05</org.attoparser.version> + <org.thymeleaf.version>3.0.0.RELEASE</org.thymeleaf.version> + <org.attoparser.version>2.0.0.RELEASE</org.attoparser.version> <org.unbescape.version>1.1.3.RELEASE</org.unbescape.version> - <ognl.version>3.1.2</ognl.version> + <ognl.version>3.1.3</ognl.version> <com.fasterxml.jackson.version>2.6.3</com.fasterxml.jackson.version> </properties> @@ -141,6 +141,12 @@ <version>${ognl.version}</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.20.0-GA</version> + <scope>provided</scope> + </dependency> <!-- logging --> <dependency> <groupId>org.slf4j</groupId> diff --git a/src/main/java/org/thymeleaf/engine/TemplateManager.java b/src/main/java/org/thymeleaf/engine/TemplateManager.java index 28b34d8..0700825 100644 --- a/src/main/java/org/thymeleaf/engine/TemplateManager.java +++ b/src/main/java/org/thymeleaf/engine/TemplateManager.java @@ -681,14 +681,10 @@ public final class TemplateManager { } - public ThrottledTemplateProcessor parseAndProcessThrottled( - final TemplateSpec templateSpec, - final IContext context, - final Writer writer) { + public ThrottledTemplateProcessor parseAndProcessThrottled(final TemplateSpec templateSpec, final IContext context) { Validate.notNull(templateSpec, "Template Specification cannot be null"); Validate.notNull(context, "Context cannot be null"); - Validate.notNull(writer, "Writer cannot be null"); // TemplateSpec will already have validated its contents, so need to do it here (template selectors, @@ -712,7 +708,7 @@ public final class TemplateManager { * Instantiate the throttling artifacts */ final TemplateFlowController flowController = new TemplateFlowController(); - final ThrottledTemplateWriter throttledTemplateWriter = new ThrottledTemplateWriter(template, flowController, writer); + final ThrottledTemplateWriter throttledTemplateWriter = new ThrottledTemplateWriter(template, flowController); /* -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
