[MAINTENANCE] Upgrade to mockito-core 4.11.0

async/async-impl/pom.xml

@@ -60,7 +60,7 @@
         <lastReleaseVersion>1.0.1</lastReleaseVersion>
 
         <cglib-nodep.version>3.2.4</cglib-nodep.version>
-        <mockito-core.version>1.9.5</mockito-core.version>
+        <mockito-core.version>4.11.0</mockito-core.version>
         <org.apache.aries.async.api.version>1.0.2-SNAPSHOT</org.apache.aries.async.api.version>
         <org.apache.aries.async.promise.api.version>1.1.0-SNAPSHOT</org.apache.aries.async.promise.api.version>
         <org.osgi.service.log.version>1.5.0</org.osgi.service.log.version>

async/async-impl/src/test/java/org/apache/aries/async/impl/AsyncServiceTest.java

@@ -32,7 +32,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.osgi.service.log.LogService;
 import org.osgi.util.function.Predicate;
 import org.osgi.util.promise.Promise;

jmx/jmx-core-whiteboard/pom.xml

@@ -68,7 +68,7 @@
         </aries.osgi.dynamic>
         <lastReleaseVersion>1.1.1</lastReleaseVersion>
 
-        <mockito-core.version>1.8.2</mockito-core.version>
+        <mockito-core.version>4.11.0</mockito-core.version>
         <org.apache.aries.jmx.api.version>1.1.5</org.apache.aries.jmx.api.version>
         <org.apache.aries.jmx.core.version>1.1.8</org.apache.aries.jmx.core.version>
         <org.apache.aries.util.version>1.1.1</org.apache.aries.util.version>

jmx/jmx-core/pom.xml

@@ -78,7 +78,7 @@
         <lastReleaseVersion>1.1.1</lastReleaseVersion>
 
         <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
-        <mockito-core.version>1.8.2</mockito-core.version>
+        <mockito-core.version>4.11.0</mockito-core.version>
         <org.apache.aries.jmx.api.version>1.1.5</org.apache.aries.jmx.api.version>
         <org.apache.aries.util.version>1.1.1</org.apache.aries.util.version>
     </properties>

jmx/jmx-core/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminTest.java

@@ -19,8 +19,8 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
@@ -36,6 +36,7 @@
 import org.apache.aries.jmx.codec.PropertyData;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.Configuration;
 
@@ -156,7 +157,7 @@ public void testGetFactoryPid() throws Exception {
         String factoryPid = "org.apache.aries.jmx.factory.mock";
 
         Configuration config = mock(Configuration.class);
-        when(admin.getConfiguration(eq(factoryPid  + "-1260133982371-0"), anyString())).thenReturn(config);
+        when(admin.getConfiguration(eq(factoryPid  + "-1260133982371-0"), ArgumentMatchers.<String>any())).thenReturn(config);
         when(config.getFactoryPid()).thenReturn(factoryPid);
 
         ConfigurationAdmin mbean = new ConfigurationAdmin(admin);
@@ -176,7 +177,7 @@ public void testGetProperties() throws Exception {
         Dictionary<String, Object> props = new Hashtable<String, Object>();
         props.put("one", "value");
         props.put("two", 2);
-        when(admin.getConfiguration(eq(pid), anyString())).thenReturn(config);
+        when(admin.getConfiguration(eq(pid), ArgumentMatchers.<String>any())).thenReturn(config);
         when(config.getProperties()).thenReturn(props);
 
         ConfigurationAdmin mbean = new ConfigurationAdmin(admin);

jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/BundleStateTest.java

@@ -43,6 +43,7 @@
 import org.apache.aries.jmx.codec.BundleEventData;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
@@ -189,6 +190,7 @@ public void testLifeCycleOfNotificationSupport() throws Exception {
 
         BundleListener listener = argument.getValue();
         assertNotNull(listener);
+        Mockito.reset(context);
 
         ExecutorService dispatcher = bundleState.getEventDispatcher();
 
@@ -197,9 +199,7 @@ public void testLifeCycleOfNotificationSupport() throws Exception {
         bundleState.postRegister(true);
 
         // check no more actions on BundleContext
-        argument = ArgumentCaptor.forClass(BundleListener.class);
-        verify(context, atMost(1)).addBundleListener(argument.capture());
-        assertEquals(1, argument.getAllValues().size());
+        verify(context, never()).addBundleListener(argument.capture());
 
         //do one unregister
         bundleState.postDeregister();

jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/ServiceStateTest.java

@@ -49,6 +49,7 @@
 import org.apache.aries.jmx.Logger;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
 import org.osgi.framework.AllServiceListener;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -204,6 +205,7 @@ public void testLifeCycleOfNotificationSupport() throws Exception {
 
         AllServiceListener serviceListener = argument.getValue();
         assertNotNull(serviceListener);
+        Mockito.reset(context);
 
         ExecutorService dispatcher = serviceState.getEventDispatcher();
 
@@ -212,9 +214,7 @@ public void testLifeCycleOfNotificationSupport() throws Exception {
         serviceState.postRegister(true);
 
         // check no more actions on BundleContext
-        argument = ArgumentCaptor.forClass(AllServiceListener.class);
-        verify(context, atMost(1)).addServiceListener(argument.capture());
-        assertEquals(1, argument.getAllValues().size());
+        verify(context, never()).addServiceListener(argument.capture());
 
         //do one unregister
         serviceState.postDeregister();

jmx/jmx-core/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceTest.java

@@ -19,7 +19,7 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;

jmx/jmx-core/src/test/java/org/apache/aries/jmx/util/FrameworkUtilsTest.java

@@ -31,7 +31,6 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -41,6 +40,7 @@
 import java.util.Set;
 
 import org.junit.Test;
+import org.mockito.ArgumentMatchers;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -79,7 +79,7 @@ public void testResolveService() throws Exception {
 
         BundleContext context = mock(BundleContext.class);
         ServiceReference reference = mock(ServiceReference.class);
-        when(context.getAllServiceReferences(anyString(), anyString())).thenReturn(new ServiceReference[] { reference });        
+        when(context.getAllServiceReferences(ArgumentMatchers.<String>any(), ArgumentMatchers.<String>any())).thenReturn(new ServiceReference[] { reference });
         ServiceReference result = resolveService(context, 998);
         assertNotNull(result);
 

jmx/jmx-whiteboard/pom.xml

@@ -83,7 +83,7 @@
         <exam.version>3.4.0</exam.version>
         <javax.inject.version>1</javax.inject.version>
         <maven-antrun-plugin.version>1.3</maven-antrun-plugin.version>
-        <mockito-core.version>1.10.19</mockito-core.version>
+        <mockito-core.version>4.11.0</mockito-core.version>
         <org.apache.aries.jmx.core.version>1.1.8</org.apache.aries.jmx.core.version>
         <org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version>
         <tinybundles.version>2.0.0</tinybundles.version>

pushstream/pom.xml

@@ -48,7 +48,7 @@
 
         <bnd-maven-plugin.version>3.2.0</bnd-maven-plugin.version>
         <junit.version>4.13.2</junit.version>
-        <mockito-core.version>1.9.5</mockito-core.version>
+        <mockito-core.version>4.11.0</mockito-core.version>
         <org.apache.aries.async.promise.api.version>1.0.1</org.apache.aries.async.promise.api.version>
         <osgi.annotation.version>6.0.1</osgi.annotation.version>
         <slf4j-api.version>1.7.0</slf4j-api.version>

spi-fly/spi-fly-itests/test.bndrun

@@ -51,7 +51,7 @@
     bnd.identity;id='junit-platform-launcher'
 
 -runbundles: \
-	assertj-core;version='[3.27.2,3.27.3)',\
+	assertj-core;version='[3.27.3,3.27.4)',\
 	junit-jupiter-api;version='[5.11.4,5.11.5)',\
 	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
 	junit-jupiter-params;version='[5.11.4,5.11.5)',\