commit 4d268287206a3470407645a25d75698a93f0743a
author Oliver Lietz <olli@apache.org> Sat Jun 15 16:59:31 2019 +0200
committer Oliver Lietz <olli@apache.org> Sat Jun 15 16:59:41 2019 +0200
tree 3333370622c8af2edd7ac8de01c367ed56d29dd1
parent f07c1a458f112b480afe619e3bbc36013b1add12

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

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 -->

src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java

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 @@
 
 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 @@
 
     protected static final String FACTORY_PID = "org.apache.sling.resource.presence.internal.ResourcePresenter";
 
-    protected Option baseConfiguration() {
+    protected ModifiableCompositeOption baseConfiguration() {
         return composite(
             super.baseConfiguration(),
             slingQuickstart(),