This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch feature/java21-compat in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git
commit fdae56a22035d8a868594c18f6cdde53b23dda18 Author: Konrad Windszus <[email protected]> AuthorDate: Fri Mar 1 16:42:39 2024 +0100 SLING-12260 Increase Mockito to 5.11.0 to support building on Java 21 --- pom.xml | 3 ++- .../sling/event/impl/jobs/queues/JobExecutionContextImplTest.java | 2 +- .../org/apache/sling/event/impl/jobs/queues/TestTopicHalting.java | 2 +- .../sling/event/impl/jobs/tasks/HistoryCleanUpRemovedJobsTest.java | 7 +------ .../apache/sling/event/impl/jobs/tasks/HistoryCleanUpTaskTest.java | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 8b8a7be..29b02af 100644 --- a/pom.xml +++ b/pom.xml @@ -47,6 +47,7 @@ <min.port>37000</min.port> <max.port>37999</max.port> <project.build.outputTimestamp>2023-10-05T16:16:32Z</project.build.outputTimestamp> + <minimalJavaBuildVersion>11</minimalJavaBuildVersion><!-- Paxexam 4 requires Java 11 --> </properties> @@ -244,7 +245,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>3.11.0</version> + <version>5.11.0</version> <scope>test</scope> </dependency> <dependency> diff --git a/src/test/java/org/apache/sling/event/impl/jobs/queues/JobExecutionContextImplTest.java b/src/test/java/org/apache/sling/event/impl/jobs/queues/JobExecutionContextImplTest.java index 6c23060..0e3fa32 100644 --- a/src/test/java/org/apache/sling/event/impl/jobs/queues/JobExecutionContextImplTest.java +++ b/src/test/java/org/apache/sling/event/impl/jobs/queues/JobExecutionContextImplTest.java @@ -88,10 +88,10 @@ public class JobExecutionContextImplTest { context.registerService(JobManagerConfiguration.class, configuration); context.registerService(TopologyCapabilities.class, capabilities); context.registerService(QueueConfigurationManager.class, queueConfigMgr); + context.registerService(ThreadPoolManager.class, threadPoolManager); context.registerService(MetricRegistry.class, metric); context.registerService(QueueManager.class, qManager); context.registerService(JobConsumerManager.class, jobConsumerManager); - context.registerService(ThreadPoolManager.class, threadPoolManager); context.registerService(StatisticsManager.class, statisticsManager); context.registerService(QueuesMBean.class, queuesMBean); context.registerService(Scheduler.class, scheduler); diff --git a/src/test/java/org/apache/sling/event/impl/jobs/queues/TestTopicHalting.java b/src/test/java/org/apache/sling/event/impl/jobs/queues/TestTopicHalting.java index a75c92d..75736e0 100644 --- a/src/test/java/org/apache/sling/event/impl/jobs/queues/TestTopicHalting.java +++ b/src/test/java/org/apache/sling/event/impl/jobs/queues/TestTopicHalting.java @@ -72,7 +72,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import org.osgi.framework.BundleContext; import org.osgi.service.component.ComponentContext; diff --git a/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpRemovedJobsTest.java b/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpRemovedJobsTest.java index 6860ae2..a54cc93 100644 --- a/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpRemovedJobsTest.java +++ b/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpRemovedJobsTest.java @@ -23,25 +23,20 @@ import static org.junit.Assert.assertNull; import java.text.SimpleDateFormat; import java.util.Calendar; -import java.util.Map; import org.apache.sling.api.resource.Resource; import org.apache.sling.event.impl.jobs.JobImpl; import org.apache.sling.event.impl.jobs.config.JobManagerConfiguration; import org.apache.sling.event.impl.jobs.scheduling.JobSchedulerImpl; import org.apache.sling.event.jobs.Job; -import org.apache.sling.event.jobs.consumer.JobExecutionContext; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Answers; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; - -import com.google.common.collect.Maps; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class HistoryCleanUpRemovedJobsTest { diff --git a/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpTaskTest.java b/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpTaskTest.java index 6f92c1d..5599964 100644 --- a/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpTaskTest.java +++ b/src/test/java/org/apache/sling/event/impl/jobs/tasks/HistoryCleanUpTaskTest.java @@ -38,7 +38,7 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import com.google.common.collect.Maps;
