This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tenant.git
The following commit(s) were added to refs/heads/master by this push: new f8da572 SLING-12286 - Tenant build fails with Java 17 or newer (#4) f8da572 is described below commit f8da5721bbc5a43e30ce4d286a9bc061833cd354 Author: Robert Munteanu <romb...@apache.org> AuthorDate: Thu Apr 11 10:58:37 2024 +0200 SLING-12286 - Tenant build fails with Java 17 or newer (#4) Update to Mockito 4.x --- pom.xml | 4 ++-- .../java/org/apache/sling/tenant/internal/TenantProviderImplTest.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0e0b758..2f3c1bc 100644 --- a/pom.xml +++ b/pom.xml @@ -127,8 +127,8 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.10.19</version> + <artifactId>mockito-core</artifactId> + <version>4.11.0</version> <scope>test</scope> </dependency> <dependency> diff --git a/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java b/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java index 5b94a36..1bd9039 100644 --- a/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java +++ b/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java @@ -26,6 +26,7 @@ import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.tenant.Tenant; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.osgi.framework.BundleContext; @@ -37,7 +38,7 @@ public class TenantProviderImplTest { final BundleContext context = Mockito.mock(BundleContext.class); final ResourceResolver rr = Mockito.mock(ResourceResolver.class); Mockito.when(rrf.getServiceResourceResolver( - Mockito.anyMapOf(String.class, Object.class))).thenReturn(rr); + ArgumentMatchers.any())).thenReturn(rr); TenantProviderImpl.Configuration configuration = new TenantProviderImpl.Configuration() { @Override public Class<? extends Annotation> annotationType() {