commit 68c4e43524b1ceddd5e572eb23ee1f7a4a03fd63
author Oliver Lietz <olli@apache.org> Thu Jul 13 01:35:59 2023 +0200
committer Oliver Lietz <olli@apache.org> Thu Jul 13 01:35:59 2023 +0200
tree 03a6420785102b594dc296dfab45c81450ce70d0
parent 19a1866c4aa16ef35c38b77321b8f0fcd1cb7a89

SLING-11961 Update Testing PaxExam to 4.0.0

pom.xml

diff --git a/pom.xml b/pom.xml
index 1c63461..5826e7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>6.0.3</version>
+      <version>7.0.5</version>
       <scope>test</scope>
     </dependency>
     <!-- Apache Jackrabbit -->
@@ -168,7 +168,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.testing.paxexam</artifactId>
-      <version>3.1.0</version>
+      <version>4.0.0</version>
       <scope>test</scope>
     </dependency>
     <!-- Google -->

src/test/java/org/apache/sling/jcr/presence/JcrPresenceTestSupport.java

diff --git a/src/test/java/org/apache/sling/jcr/presence/JcrPresenceTestSupport.java b/src/test/java/org/apache/sling/jcr/presence/JcrPresenceTestSupport.java
index ebc2fb5..a6bc959 100644
--- a/src/test/java/org/apache/sling/jcr/presence/JcrPresenceTestSupport.java
+++ b/src/test/java/org/apache/sling/jcr/presence/JcrPresenceTestSupport.java
@@ -69,18 +69,10 @@
             mavenBundle().groupId("com.googlecode.java-diff-utils").artifactId("diffutils").versionAsInProject(),
             newConfiguration("org.apache.sling.jcr.base.internal.LoginAdminWhitelist")
                 .put("whitelist.bundles.regexp", "PAXEXAM-PROBE-.*")
-                .asOption(),
-            jacoco() // remove with Testing PaxExam 4.0
+                .asOption()
         );
     }
 
-    // remove with Testing PaxExam 4.0
-    protected OptionalCompositeOption jacoco() {
-        final String jacocoCommand = System.getProperty("jacoco.command");
-        final VMOption option = Objects.nonNull(jacocoCommand) && !jacocoCommand.trim().isEmpty() ? vmOption(jacocoCommand) : null;
-        return when(Objects.nonNull(option)).useOptions(option);
-    }
-
     protected Option slingQuickstart() {
         final int httpPort = findFreePort();
         final String workingDirectory = workingDirectory();