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 15:00:32 UTC
[sling-org-apache-sling-resource-presence] 03/03: SLING-8510 Make
testing compliant with Java 9 and higher
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-resource-presence.git
commit 4d268287206a3470407645a25d75698a93f0743a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 16:59:31 2019 +0200
SLING-8510 Make testing compliant with Java 9 and higher
* Use Sling Bundle Parent 35
* Update Pax Exam to 4.13.1
* Update Testing PaxExam to 3.0.0
* Update Felix Framework to 6.0.3
---
pom.xml | 10 +++++-----
.../sling/resource/presence/ResourcePresenterTestSupport.java | 3 ++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index fc20ee4..bb3a6d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,8 +23,8 @@
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath />
</parent>
@@ -38,7 +38,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sling.java.version>8</sling.java.version>
- <org.ops4j.pax.exam.version>4.11.0</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.13.1</org.ops4j.pax.exam.version>
</properties>
<scm>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>5.6.10</version>
+ <version>6.0.3</version>
<scope>test</scope>
</dependency>
<!-- Apache Sling -->
@@ -103,7 +103,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>1.0.0</version>
+ <version>3.0.0</version>
<scope>provided</scope>
</dependency>
<!-- nullability -->
diff --git a/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java b/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java
index e62645c..dcaa8c0 100644
--- a/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java
+++ b/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java
@@ -20,6 +20,7 @@ package org.apache.sling.resource.presence;
import org.apache.sling.testing.paxexam.TestSupport;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.options.ModifiableCompositeOption;
import static org.apache.sling.testing.paxexam.SlingOptions.slingQuickstartOakTar;
import static org.ops4j.pax.exam.CoreOptions.composite;
@@ -31,7 +32,7 @@ public abstract class ResourcePresenterTestSupport extends TestSupport {
protected static final String FACTORY_PID = "org.apache.sling.resource.presence.internal.ResourcePresenter";
- protected Option baseConfiguration() {
+ protected ModifiableCompositeOption baseConfiguration() {
return composite(
super.baseConfiguration(),
slingQuickstart(),