Author: olli
Date: Mon May 16 12:41:57 2016
New Revision: 1744042
URL: http://svn.apache.org/viewvc?rev=1744042&view=rev
Log:
SLING-5075 Upgrade Thymeleaf to 3.0
fix reference cardinality (ResourceBundleProvider is mandatory)
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ResourceBundleMessageResolver.java
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ResourceBundleMessageResolver.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ResourceBundleMessageResolver.java?rev=1744042&r1=1744041&r2=1744042&view=diff
==============================================================================
---
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ResourceBundleMessageResolver.java
(original)
+++
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ResourceBundleMessageResolver.java
Mon May 16 12:41:57 2016
@@ -53,7 +53,7 @@ import org.thymeleaf.messageresolver.IMe
public class ResourceBundleMessageResolver implements IMessageResolver {
@Reference(
- cardinality = ReferenceCardinality.OPTIONAL,
+ cardinality = ReferenceCardinality.MANDATORY,
policy = ReferencePolicy.DYNAMIC,
policyOption = ReferencePolicyOption.GREEDY,
bind = "setResourceBundleProvider",
