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 2016/05/12 13:09:17 UTC
svn commit: r1743496 - in
/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf:
pom.xml src/main/java/org/thymeleaf/engine/TemplateManager.java
Author: olli
Date: Thu May 12 13:09:16 2016
New Revision: 1743496
URL: http://svn.apache.org/viewvc?rev=1743496&view=rev
Log:
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
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/thymeleaf/engine/TemplateManager.java
Modified: sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml?rev=1743496&r1=1743495&r2=1743496&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml (original)
+++ sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml Thu May 12 13:09:16 2016
@@ -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>
Modified: sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/thymeleaf/engine/TemplateManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/thymeleaf/engine/TemplateManager.java?rev=1743496&r1=1743495&r2=1743496&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/thymeleaf/engine/TemplateManager.java (original)
+++ sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/thymeleaf/engine/TemplateManager.java Thu May 12 13:09:16 2016
@@ -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);
/*