SLING-6603 Update FreeMarker to 2.3.25-incubating
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1785436 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 1888589..8769e7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,36 +56,8 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <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>
- <DynamicImport-Package>
- *
- </DynamicImport-Package>
<ScriptEngine-Name>${project.name}</ScriptEngine-Name>
<ScriptEngine-Version>${project.version}</ScriptEngine-Version>
- <_removeheaders>
- Embed-Dependency,
- Private-Package,
- Include-Resource
- </_removeheaders>
</instructions>
</configuration>
</plugin>
@@ -237,7 +209,7 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
- <version>2.3.24-incubating</version>
+ <version>2.3.25-incubating</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java
index a8b2c01..7133c32 100644
--- a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java
+++ b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java
@@ -66,6 +66,7 @@
launchpad(),
// Sling Scripting FreeMarker
testBundle("bundle.filename"),
+ mavenBundle().groupId("org.freemarker").artifactId("freemarker").versionAsInProject(),
mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.jaxp-api-1.4").versionAsInProject(),
bootDelegationPackage("javax.swing.*"),
// testing
