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/12/03 23:44:44 UTC
svn commit: r1717859 -
/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java
Author: olli
Date: Thu Dec 3 22:44:44 2015
New Revision: 1717859
URL: http://svn.apache.org/viewvc?rev=1717859&view=rev
Log:
SLING-5351 Thymeleaf fails loading version from properties
Modified:
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java
Modified: sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java?rev=1717859&r1=1717858&r2=1717859&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java (original)
+++ sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java Thu Dec 3 22:44:44 2015
@@ -42,7 +42,6 @@ import org.osgi.service.component.Compon
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.thymeleaf.TemplateEngine;
-import org.thymeleaf.Thymeleaf;
import org.thymeleaf.dialect.IDialect;
import org.thymeleaf.messageresolver.IMessageResolver;
import org.thymeleaf.standard.StandardDialect;
@@ -190,7 +189,13 @@ public final class ThymeleafScriptEngine
@Override
public String getLanguageVersion() {
- return Thymeleaf.VERSION;
+ try {
+ final java.util.Properties properties = new java.util.Properties();
+ properties.load(getClass().getResourceAsStream("org/thymeleaf/thymeleaf.properties"));
+ return properties.getProperty("version");
+ } catch (Exception e) {
+ }
+ return "";
}
@Override