Author: justin
Date: Tue Jun 14 21:46:16 2011
New Revision: 1135816
URL: http://svn.apache.org/viewvc?rev=1135816&view=rev
Log:
SLING-2102 - updating Freemarker version
Modified:
sling/trunk/contrib/scripting/freemarker/pom.xml
Modified: sling/trunk/contrib/scripting/freemarker/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/freemarker/pom.xml?rev=1135816&r1=1135815&r2=1135816&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/freemarker/pom.xml (original)
+++ sling/trunk/contrib/scripting/freemarker/pom.xml Tue Jun 14 21:46:16 2011
@@ -57,13 +57,23 @@
</Private-Package>
<Embed-Dependency>freemarker;inline=true</Embed-Dependency>
+ <!--
+ A few notes on the lines below:
+ * Freemarker's SLF4J support depends upon
org.slf4j.spi. Grrr. They'll have to use Log4J.
+ * If you want XPath support in Freemarker, it appears
you need to provide one of Xalan standalone
+ Sun's internalized version of Xalan, or Jaxen.
+ -->
<Import-Package>
+ !org.slf4j.*,
+ com.sun.org.apache.xml.internal.*;
+ com.sun.org.apache.xpath.internal.*;
javax.servlet.jsp.*; javax.swing.*;
org.apache.log; org.apache.log4j;
org.apache.tools.ant.*;
org.apache.xml.utils; org.apache.xpath.*;
org.dom4j.*; org.jaxen.*; org.jdom.*;
org.mozilla.javascript;
+ org.zeroturnaround.javarebel;
org.python.*;resolution:=optional, *
</Import-Package>
@@ -124,9 +134,9 @@
<artifactId>jcr</artifactId>
</dependency>
<dependency>
- <groupId>freemarker</groupId>
+ <groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
- <version>2.3.6</version>
+ <version>2.3.18</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
