This is an automated email from the ASF dual-hosted git repository.
stefanegli pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git
The following commit(s) were added to refs/heads/master by this push:
new 9a244f8 SLING-11923 : fixed IT failures for JDK 17 (#32)
9a244f8 is described below
commit 9a244f8c5931800ab88942c32d73f7e6c54bc63e
Author: Rishabh Kumar <[email protected]>
AuthorDate: Tue Jul 18 21:20:52 2023 +0530
SLING-11923 : fixed IT failures for JDK 17 (#32)
* SLING-11923 : fixed IT failures for JDK 17
* SLING-11923 : removed jacoco while using pax exam 4
* Update InitDelayingTopologyEventListenerTest.java
* SLING-11923 : removed .java-version file
* SLING-11923 : ignored .java-version file
---------
Co-authored-by: Rishabh Kumar <[email protected]>
---
.gitignore | 1 +
pom.xml | 6 +++---
.../discovery/InitDelayingTopologyEventListenerTest.java | 2 +-
.../java/org/apache/sling/event/it/JobsTestSupport.java | 16 +---------------
4 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/.gitignore b/.gitignore
index 19758c5..c27bf58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ maven-eclipse.xml
jcr.log
atlassian-ide-plugin.xml
.vscode
+.java-version
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0800539..71dce0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -268,7 +268,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
- <version>2.1.10-1.16.0</version>
+ <version>3.1.0-1.40.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -287,7 +287,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>7.0.1</version>
+ <version>7.0.5</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -309,7 +309,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>
<dependency>
diff --git
a/src/test/java/org/apache/sling/event/impl/discovery/InitDelayingTopologyEventListenerTest.java
b/src/test/java/org/apache/sling/event/impl/discovery/InitDelayingTopologyEventListenerTest.java
index b8f4772..da08b3c 100644
---
a/src/test/java/org/apache/sling/event/impl/discovery/InitDelayingTopologyEventListenerTest.java
+++
b/src/test/java/org/apache/sling/event/impl/discovery/InitDelayingTopologyEventListenerTest.java
@@ -304,7 +304,7 @@ public class InitDelayingTopologyEventListenerTest {
listener.handleTopologyEvent(createEvent(Type.TOPOLOGY_CHANGING));
listener.handleTopologyEvent(createEvent(Type.TOPOLOGY_CHANGED));
listener.handleTopologyEvent(createEvent(Type.PROPERTIES_CHANGED));
- delegate.waitForEventCnt(1, 5000);
+ delegate.waitForEventCnt(1, 10000);
assertEquals(delegate.getEvents().get(0).getType(),
Type.TOPOLOGY_INIT);
doTestAdditionalEventsAfterInit(delegate, listener);
diff --git a/src/test/java/org/apache/sling/event/it/JobsTestSupport.java
b/src/test/java/org/apache/sling/event/it/JobsTestSupport.java
index ef76bde..8e3db2f 100644
--- a/src/test/java/org/apache/sling/event/it/JobsTestSupport.java
+++ b/src/test/java/org/apache/sling/event/it/JobsTestSupport.java
@@ -18,7 +18,6 @@
*/
package org.apache.sling.event.it;
-import java.util.Objects;
import javax.inject.Inject;
@@ -27,8 +26,6 @@ import org.apache.sling.event.jobs.JobManager;
import org.apache.sling.testing.paxexam.TestSupport;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.ModifiableCompositeOption;
-import org.ops4j.pax.exam.options.OptionalCompositeOption;
-import org.ops4j.pax.exam.options.extra.VMOption;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,8 +36,6 @@ import static
org.apache.sling.testing.paxexam.SlingOptions.versionResolver;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.vmOption;
-import static org.ops4j.pax.exam.CoreOptions.when;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
public abstract class JobsTestSupport extends TestSupport {
@@ -83,8 +78,7 @@ public abstract class JobsTestSupport extends TestSupport {
// testing
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.tools").versionAsInProject(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.json").versionAsInProject(),
- junitBundles(),
- jacoco() // remove with Testing PaxExam 4.0
+ junitBundles()
).remove(
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.event").version(versionResolver)
);
@@ -97,12 +91,4 @@ public abstract class JobsTestSupport extends TestSupport {
slingQuickstartOakTar(workingDirectory, httpPort)
);
}
-
- // 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);
- }
-
}
