sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject svn commit: r1785436 - in /sling/trunk/contrib/scripting/freemarker: pom.xml src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java
Date Sat, 04 Mar 2017 08:31:49 GMT
Author: olli
Date: Sat Mar  4 08:31:48 2017
New Revision: 1785436

URL: http://svn.apache.org/viewvc?rev=1785436&view=rev
Log:
SLING-6603 Update FreeMarker to 2.3.25-incubating

Modified:
    sling/trunk/contrib/scripting/freemarker/pom.xml
    sling/trunk/contrib/scripting/freemarker/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java

Modified: sling/trunk/contrib/scripting/freemarker/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/freemarker/pom.xml?rev=1785436&r1=1785435&r2=1785436&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/freemarker/pom.xml (original)
+++ sling/trunk/contrib/scripting/freemarker/pom.xml Sat Mar  4 08:31:48 2017
@@ -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>

Modified: sling/trunk/contrib/scripting/freemarker/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/freemarker/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java?rev=1785436&r1=1785435&r2=1785436&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/freemarker/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java
(original)
+++ sling/trunk/contrib/scripting/freemarker/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java
Sat Mar  4 08:31:48 2017
@@ -66,6 +66,7 @@ public abstract class FreemarkerTestSupp
             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



Mime
View raw message