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 2019/06/15 13:08:21 UTC
[sling-org-apache-sling-scripting-freemarker] 03/04: SLING-8498
Update Testing PaxExam to 3.0.0
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-freemarker.git
commit 23f39e5adbb5e3ca3848978815127919b7a55217
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 10:39:49 2019 +0200
SLING-8498 Update Testing PaxExam to 3.0.0
---
pom.xml | 2 +-
.../sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3e9c2cd..c657d8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,7 +202,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>2.0.0</version>
+ <version>3.0.0</version>
<scope>test</scope>
</dependency>
<!-- FreeMarker -->
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 c8697c7..5f64874 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
@@ -29,6 +29,7 @@ import org.apache.sling.testing.paxexam.TestSupport;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.ProbeBuilder;
import org.ops4j.pax.exam.TestProbeBuilder;
+import org.ops4j.pax.exam.options.ModifiableCompositeOption;
import org.ops4j.pax.exam.util.Filter;
import org.osgi.framework.Constants;
import org.osgi.service.http.HttpService;
@@ -65,7 +66,7 @@ public abstract class FreemarkerTestSupport extends TestSupport {
@Filter(value = "(names=freemarker)")
protected ScriptEngineFactory scriptEngineFactory;
- public Option baseConfiguration() {
+ public ModifiableCompositeOption baseConfiguration() {
return composite(
super.baseConfiguration(),
slingQuickstart(),