Author: olli
Date: Sat Mar 4 11:10:18 2017
New Revision: 1785466
URL: http://svn.apache.org/viewvc?rev=1785466&view=rev
Log:
SLING-6603 Update FreeMarker to 2.3.25-incubating
remove obsolete configuration for boot delegation package
Modified:
sling/trunk/contrib/scripting/freemarker/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java
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=1785466&r1=1785465&r2=1785466&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 11:10:18 2017
@@ -36,7 +36,6 @@ import org.osgi.service.http.HttpService
import static
org.apache.sling.testing.paxexam.SlingOptions.slingExtensionModels;
import static
org.apache.sling.testing.paxexam.SlingOptions.slingLaunchpadOakTar;
import static org.apache.sling.testing.paxexam.SlingOptions.slingScripting;
-import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackage;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
@@ -69,7 +68,6 @@ public abstract class FreemarkerTestSupp
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
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.resource.presence").versionAsInProject(),
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
