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:43 UTC
[sling-org-apache-sling-scripting-groovy] 03/04: SLING-8501 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-groovy.git
commit 797ad0611443f86ff8058498303dcf9ffd0a5483
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 10:42:19 2019 +0200
SLING-8501 Update Testing PaxExam to 3.0.0
---
pom.xml | 2 +-
.../java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 45b3ea1..d56ebfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,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>
<!-- Groovy -->
diff --git a/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java b/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
index 560d8e2..f612f40 100644
--- a/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
+++ b/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
@@ -31,6 +31,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.service.http.HttpService;
@@ -68,7 +69,7 @@ public class GroovyTestSupport extends TestSupport {
@Inject
protected TemplateEngine templateEngine;
- public Option baseConfiguration() {
+ public ModifiableCompositeOption baseConfiguration() {
return composite(
super.baseConfiguration(),
quickstart(),